[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog fileio.c
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/src ChangeLog fileio.c |
Date: |
Sat, 28 Mar 2009 02:06:08 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/03/28 02:06:08
Modified files:
src : ChangeLog fileio.c
Log message:
(Finsert_file_contents): Don't limit size to INT_MAX/4.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7455&r2=1.7456
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fileio.c?cvsroot=emacs&r1=1.651&r2=1.652
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7455
retrieving revision 1.7456
diff -u -b -r1.7455 -r1.7456
--- ChangeLog 27 Mar 2009 18:40:04 -0000 1.7455
+++ ChangeLog 28 Mar 2009 02:06:06 -0000 1.7456
@@ -1,3 +1,7 @@
+2009-03-28 Stefan Monnier <address@hidden>
+
+ * fileio.c (Finsert_file_contents): Don't limit size to INT_MAX/4.
+
2009-03-27 Jan Djärv <address@hidden>
* frame.c (x_set_font): If the fullscreen property is non-nil, adjust
Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -b -r1.651 -r1.652
--- fileio.c 24 Mar 2009 14:14:54 -0000 1.651
+++ fileio.c 28 Mar 2009 02:06:08 -0000 1.652
@@ -3300,7 +3300,11 @@
overflow. The calculations below double the file size
twice, so check that it can be multiplied by 4 safely. */
if (XINT (end) != st.st_size
- || st.st_size > INT_MAX / 4)
+ /* Actually, it should test either INT_MAX or LONG_MAX
+ depending on which one is used for EMACS_INT. But in
+ any case, in practice, this test is redundant with the
+ one above.
+ || st.st_size > INT_MAX / 4 */)
error ("Maximum buffer size exceeded");
/* The file size returned from stat may be zero, but data