aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-03 23:52:29 -0700
committerPaul Eggert2011-04-03 23:52:29 -0700
commite7b9e80fe230ed80004673124a6f9465d89f4882 (patch)
treea21f1fa0d29fbd137062b2a8c30cb06c9c8c0e3d /src
parent56201685698d93de22abf64377d4cf5e641ed6b3 (diff)
downloademacs-e7b9e80fe230ed80004673124a6f9465d89f4882.tar.gz
emacs-e7b9e80fe230ed80004673124a6f9465d89f4882.zip
* print.c (print_error_message): Avoid int overflow.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/print.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ebe2e082e66..ab296dded6f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-04-04 Paul Eggert <eggert@cs.ucla.edu> 12011-04-04 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * print.c (print_error_message): Avoid int overflow.
4
3 * font.c (font_list_entities): Redo for clarity, 5 * font.c (font_list_entities): Redo for clarity,
4 so that reader need not know FONT_DPI_INDEX + 1 == FONT_SPACING_INDEX. 6 so that reader need not know FONT_DPI_INDEX + 1 == FONT_SPACING_INDEX.
5 7
diff --git a/src/print.c b/src/print.c
index 3e0e168381b..c076e1ec973 100644
--- a/src/print.c
+++ b/src/print.c
@@ -929,7 +929,7 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context,
929 else 929 else
930 write_string_1 ("peculiar error", -1, stream); 930 write_string_1 ("peculiar error", -1, stream);
931 931
932 for (i = 0; CONSP (tail); tail = XCDR (tail), i++) 932 for (i = 0; CONSP (tail); tail = XCDR (tail), i = 1)
933 { 933 {
934 Lisp_Object obj; 934 Lisp_Object obj;
935 935