diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 15:53:39 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 15:53:39 +0300 |
| commit | 5359c32eb7402124abc9964d5d53639fe0739cea (patch) | |
| tree | d77b6967fe8420678bb9d1d936855ac0699c196a /lib/vsprintf.c | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
| download | linux-5359c32eb7402124abc9964d5d53639fe0739cea.tar.xz | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 3b777025d876..98d632277ca8 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -661,6 +661,9 @@ static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width, */ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field_width, int precision, int flags) { + if (!ptr) + return string(buf, end, "(null)", field_width, precision, flags); + switch (*fmt) { case 'F': ptr = dereference_function_descriptor(ptr); |