aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2012-07-03 14:21:01 +0400
committerDmitry Antipov2012-07-03 14:21:01 +0400
commit296094c3dde63e458242a8537d1d3c0ca299dd56 (patch)
tree200cf3a3accf6c5f82c997a9c93bf64abb4dead5 /src
parentb4886f6ece24edc42f796aef763ce08ab3aca75d (diff)
downloademacs-296094c3dde63e458242a8537d1d3c0ca299dd56.tar.gz
emacs-296094c3dde63e458242a8537d1d3c0ca299dd56.zip
* alloc.c (check_string_bytes): If GC_CHECK_STRING_BYTES
is enabled, avoid dereferencing NULL current_sblock if running undumped.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/alloc.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6eb1a07faf2..d0dfa1375f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
12012-07-03 Dmitry Antipov <dmantipov@yandex.ru> 12012-07-03 Dmitry Antipov <dmantipov@yandex.ru>
2 2
3 * alloc.c (check_string_bytes): If GC_CHECK_STRING_BYTES
4 is enabled, avoid dereferencing NULL current_sblock if
5 running undumped.
6
72012-07-03 Dmitry Antipov <dmantipov@yandex.ru>
8
3 Cleanup basic buffer management. 9 Cleanup basic buffer management.
4 * buffer.h (struct buffer): Change layout to use generic vector 10 * buffer.h (struct buffer): Change layout to use generic vector
5 marking code. Fix some comments. Change type of 'clip_changed' 11 marking code. Fix some comments. Change type of 'clip_changed'
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)
1872 for (b = oldest_sblock; b; b = b->next) 1872 for (b = oldest_sblock; b; b = b->next)
1873 check_sblock (b); 1873 check_sblock (b);
1874 } 1874 }
1875 else 1875 else if (current_sblock)
1876 check_sblock (current_sblock); 1876 check_sblock (current_sblock);
1877} 1877}
1878 1878