From 000098c13577337d3bb8cb381bd16701dc11cc32 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 17 Apr 2011 21:16:47 -0700 Subject: [PATCH] * alloc.c (allocate_string_data) [GC_CHECK_STRING_OVERRUN]: Fix typo that can cause Emacs to crash when string overrun checking is enabled. --- src/ChangeLog | 2 ++ src/alloc.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index d51052f0e3d..fa2aa03233d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,6 +4,8 @@ This doesn't fix a bug but makes the code clearer. (string_overrun_cookie): Now const. Use initializers that don't formally overflow signed char, to avoid warnings. + (allocate_string_data) [GC_CHECK_STRING_OVERRUN]: Fix typo that + can cause Emacs to crash when string overrun checking is enabled. 2011-04-17 Chong Yidong diff --git a/src/alloc.c b/src/alloc.c index 2029383dec8..2af75e3c471 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1937,7 +1937,8 @@ allocate_string_data (struct Lisp_String *s, s->size_byte = nbytes; s->data[nbytes] = '\0'; #ifdef GC_CHECK_STRING_OVERRUN - memcpy (data + needed, string_overrun_cookie, GC_STRING_OVERRUN_COOKIE_SIZE); + memcpy ((char *) data + needed, string_overrun_cookie, + GC_STRING_OVERRUN_COOKIE_SIZE); #endif /* If S had already data assigned, mark that as free by setting its