1 files changed, 6 insertions, 1 deletions
diff --git a/include/hexdump.h b/include/hexdump.h
index 1a20339b..e8f4fe1a 100644
--- a/include/hexdump.h
+++ b/include/hexdump.h
@@ -71,7 +71,7 @@ prepare_text(const void *data, size_t size, char *buf, unsigned int position)
 		else
 			buf[offset++] = '.';
 	}
-	buf[offset++] = size > 0 ? '|' : 'X';
+	buf[offset++] = '|';
 	buf[offset] = '\0';
 }
 
@@ -89,6 +89,11 @@ vhexdumpf(const char *file, int line, const char *func, const CHAR16 *const fmt,
 	if (verbose == 0)
 		return;
 
+	if (!data || !size) {
+		dprint(L"hexdump of a NULL pointer!\n");
+		return;
+	}
+
 	while (offset < size) {
 		char hexbuf[49];
 		char txtbuf[19];