* print.c (print_preprocess): Adjust to match changed

sub char-table structure and avoid crash (Bug#18038).

* print.c (print_preprocess): Adjust to match changed
sub char-table structure and avoid crash (Bug#18038).
b1bfebbf · Dmitry Antipov · 02a7e500 · b1bfebbf · b1bfebbf
Commit b1bfebbf authored Jul 17, 2014 by Dmitry Antipov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/print.c src/print.c +2 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2014-07-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* print.c (print_preprocess): Adjust to match changed
+	sub char-table structure and avoid crash (Bug#18038).
+
 2014-07-16  Eli Zaretskii  <eliz@gnu.org>

 	* xdisp.c (decode_mode_spec): Call file-remote-p on the current

--- a/src/print.c
+++ b/src/print.c
@@ -1228,7 +1228,8 @@ print_preprocess (Lisp_Object obj)
 	  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