aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-09-04 10:25:23 -0700
committerPaul Eggert2011-09-04 10:25:23 -0700
commit29ebea3b123db665db1267880df65d0ec697aff3 (patch)
treeda7069f791540b99689ea34c80f74a959a9e0f01 /src
parent3f8236f46ba78f807fa25a2b2db34d10730d51cc (diff)
downloademacs-29ebea3b123db665db1267880df65d0ec697aff3.tar.gz
emacs-29ebea3b123db665db1267880df65d0ec697aff3.zip
* print.c: Integer overflow fix.
(print_object): Use ptrdiff_t, not int, for index that can exceed INT_MAX.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/print.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9c5ca280eba..cbd8cd2c219 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12011-09-04 Paul Eggert <eggert@cs.ucla.edu> 12011-09-04 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * print.c: Integer overflow fix.
4 (print_object): Use ptrdiff_t, not int, for index that can
5 exceed INT_MAX.
6
3 * indent.c: Integer overflow fixes. 7 * indent.c: Integer overflow fixes.
4 (position_indentation): Now takes ptrdiff_t, not int. 8 (position_indentation): Now takes ptrdiff_t, not int.
5 (Fvertical_motion): Don't wrap around LINES values that don't fit 9 (Fvertical_motion): Don't wrap around LINES values that don't fit
diff --git a/src/print.c b/src/print.c
index 35f89860843..913a14b3e42 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1697,7 +1697,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
1697 } 1697 }
1698 else if (BOOL_VECTOR_P (obj)) 1698 else if (BOOL_VECTOR_P (obj))
1699 { 1699 {
1700 register int i; 1700 ptrdiff_t i;
1701 register unsigned char c; 1701 register unsigned char c;
1702 struct gcpro gcpro1; 1702 struct gcpro gcpro1;
1703 EMACS_INT size_in_chars 1703 EMACS_INT size_in_chars