[Emacs-diffs] emacs/src ChangeLog doprnt.c

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/10/21 21:29:01

Modified files:
        src            : ChangeLog doprnt.c 

Log message:
        (doprnt): Fix overflow check.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7811&r2=1.7812
http://cvs.savannah.gnu.org/viewcvs/emacs/src/doprnt.c?cvsroot=emacs&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7811
retrieving revision 1.7812
diff -u -b -r1.7811 -r1.7812
--- ChangeLog   21 Oct 2009 19:15:57 -0000      1.7811
+++ ChangeLog   21 Oct 2009 21:28:59 -0000      1.7812
@@ -1,3 +1,7 @@
+2009-10-21  Andreas Schwab  <address@hidden>
+
+       * doprnt.c (doprnt): Fix overflow check.
+
 2009-10-21  Jan Djärv  <address@hidden>
 
        * xterm.c (x_term_init): Remove XSynchronize call done for debugging.

Index: doprnt.c
===================================================================
RCS file: /sources/emacs/emacs/src/doprnt.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- doprnt.c    19 Oct 2009 04:27:14 -0000      1.54
+++ doprnt.c    21 Oct 2009 21:29:00 -0000      1.55
@@ -126,9 +126,9 @@
                  unsigned n = *fmt - '0';
                  while ('0' <= fmt[1] && fmt[1] <= '9')
                    {
-                     if (n * 10 / 10 != n
-                         || (n = n * 10 + (fmt[1] - '0')) < n)
+                     if (n * 10 + fmt[1] - '0' < n)
                        error ("Format width or precision too large");
+                     n = n * 10 + fmt[1] - '0';
                      *string++ = *++fmt;
                    }