From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Tue, 3 Jul 2012 10:21:01 +0000 (+0400)
Subject: * alloc.c (check_string_bytes): If GC_CHECK_STRING_BYTES
X-Git-Tag: emacs-24.2.90~1199^2~247
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=296094c3dde63e458242a8537d1d3c0ca299dd56;p=emacs.git

* alloc.c (check_string_bytes): If GC_CHECK_STRING_BYTES
is enabled, avoid dereferencing NULL current_sblock if
running undumped.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6eb1a07faf2..d0dfa1375f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-03  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* alloc.c (check_string_bytes): If GC_CHECK_STRING_BYTES
+	is enabled, avoid dereferencing NULL current_sblock if
+	running undumped.
+
 2012-07-03  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Cleanup basic buffer management.
diff --git a/src/alloc.c b/src/alloc.c
index b329f89d15b..3306bc4107b 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1872,7 +1872,7 @@ check_string_bytes (int all_p)
       for (b = oldest_sblock; b; b = b->next)
 	check_sblock (b);
     }
-  else
+  else if (current_sblock)
     check_sblock (current_sblock);
 }