diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:53:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:53:05 +0100 |
| commit | 3d7a96f5a485b7d06c2379f343d7312af89ec9e2 (patch) | |
| tree | 5f097f68eb0f9fd3fa4a10f38672e300e9127b10 /lib/vsprintf.c | |
| parent | 723cbe0775514853c22dc45005af59c360916af1 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
| download | op-kernel-dev-3d7a96f5a485b7d06c2379f343d7312af89ec9e2.zip op-kernel-dev-3d7a96f5a485b7d06c2379f343d7312af89ec9e2.tar.gz | |
Merge branch 'linus' into tracing/kmemtrace2
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 3b77702..98d63227 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); |
