[Emacs-diffs] trunk r117545: * print.c (print_preprocess): Adjust to match changed

[Dmitry Antipov]

------------------------------------------------------------
revno: 117545
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2014-07-17 13:12:51 +0400
message:
  * print.c (print_preprocess): Adjust to match changed
  sub char-table structure and avoid crash (Bug#18038).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/print.c                    print.c-20091113204419-o5vbwnq5f7feedwu-262

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-16 17:06:12 +0000
+++ b/src/ChangeLog     2014-07-17 09:12:51 +0000
@@ -1,3 +1,8 @@
+2014-07-17  Dmitry Antipov  <address@hidden>
+
+       * print.c (print_preprocess): Adjust to match changed
+       sub char-table structure and avoid crash (Bug#18038).
+
 2014-07-16  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (decode_mode_spec): Call file-remote-p on the current

=== modified file 'src/print.c'
--- a/src/print.c       2014-07-02 14:00:41 +0000
+++ b/src/print.c       2014-07-17 09:12:51 +0000
@@ -1228,7 +1228,8 @@
          size = ASIZE (obj);
          if (size & PSEUDOVECTOR_FLAG)
            size &= PSEUDOVECTOR_SIZE_MASK;
-         for (i = 0; i < size; i++)
+         for (i = (SUB_CHAR_TABLE_P (obj)
+                   ? SUB_CHAR_TABLE_OFFSET : 0); i < size; i++)
            print_preprocess (AREF (obj, i));
          if (HASH_TABLE_P (obj))
            { /* For hash tables, the key_and_value slot is past