From 14a34e0eef9e3b216fa60e3549f7b4cb9452afb2 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Jan 2009 11:46:17 -0800
Subject: [PATCH] --- yaml --- r: 125489 b: refs/heads/master c:
 d97106ab53f812910a62d18afb9dbe882819c1ba h: refs/heads/master i:   125487:
 425bf4fc046aa791fcd7a0b6cb8a70bf504d6d05 v: v3

---
 [refs]               | 2 +-
 trunk/lib/vsprintf.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e052937c97ae..c29df0cd115b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bfacef412b4bc993a8992217e50f1245f2fd3a6
+refs/heads/master: d97106ab53f812910a62d18afb9dbe882819c1ba
diff --git a/trunk/lib/vsprintf.c b/trunk/lib/vsprintf.c
index 3b777025d876..98d632277ca8 100644
--- a/trunk/lib/vsprintf.c
+++ b/trunk/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);