[Emacs-diffs] trunk r115147: * charset.c (syms_of_charset): Don't read past end of string.

[Paul Eggert]

------------------------------------------------------------
revno: 115147
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-19 00:57:22 -0800
message:
  * charset.c (syms_of_charset): Don't read past end of string.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/charset.c                  charset.c-20091113204419-o5vbwnq5f7feedwu-1075

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-19 02:32:26 +0000
+++ b/src/ChangeLog     2013-11-19 08:57:22 +0000
@@ -1,3 +1,7 @@
+2013-11-19  Paul Eggert  <address@hidden>
+
+       * charset.c (syms_of_charset): Don't read past end of string.
+
 2013-11-19  Glenn Morris  <address@hidden>
 
        * frame.c (Fhandle_focus_in, Fhandle_focus_out): Doc fixes.

=== modified file 'src/charset.c'
--- a/src/charset.c     2013-10-03 04:41:23 +0000
+++ b/src/charset.c     2013-11-19 08:57:22 +0000
@@ -2428,19 +2428,19 @@
   Vcurrent_iso639_language = Qnil;
 
   charset_ascii
-    = define_charset_internal (Qascii, 1, "\x00\x7F\x00\x00\x00\x00",
+    = define_charset_internal (Qascii, 1, "\x00\x7F\0\0\0\0\0",
                               0, 127, 'B', -1, 0, 1, 0, 0);
   charset_iso_8859_1
-    = define_charset_internal (Qiso_8859_1, 1, "\x00\xFF\x00\x00\x00\x00",
+    = define_charset_internal (Qiso_8859_1, 1, "\x00\xFF\0\0\0\0\0",
                               0, 255, -1, -1, -1, 1, 0, 0);
   charset_unicode
-    = define_charset_internal (Qunicode, 3, "\x00\xFF\x00\xFF\x00\x10",
+    = define_charset_internal (Qunicode, 3, "\x00\xFF\x00\xFF\x00\x10\0",
                               0, MAX_UNICODE_CHAR, -1, 0, -1, 1, 0, 0);
   charset_emacs
-    = define_charset_internal (Qemacs, 3, "\x00\xFF\x00\xFF\x00\x3F",
+    = define_charset_internal (Qemacs, 3, "\x00\xFF\x00\xFF\x00\x3F\0",
                               0, MAX_5_BYTE_CHAR, -1, 0, -1, 1, 1, 0);
   charset_eight_bit
-    = define_charset_internal (Qeight_bit, 1, "\x80\xFF\x00\x00\x00\x00",
+    = define_charset_internal (Qeight_bit, 1, "\x80\xFF\0\0\0\0\0",
                               128, 255, -1, 0, -1, 0, 1,
                               MAX_5_BYTE_CHAR + 1);
   charset_unibyte = charset_iso_8859_1;