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);