# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1238205966 0
# Node ID 9e5b3ff07060101e54ccadfeb0fbccd4261de1da
# Parent  fd3d23f156f5c720a9cf4c2e1678d98caea06325
(Finsert_file_contents): Don't limit size to INT_MAX/4.

diff -r fd3d23f156f5 -r 9e5b3ff07060 src/ChangeLog
--- a/src/ChangeLog	Fri Mar 27 18:40:04 2009 +0000
+++ b/src/ChangeLog	Sat Mar 28 02:06:06 2009 +0000
@@ -1,3 +1,7 @@
+2009-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fileio.c (Finsert_file_contents): Don't limit size to INT_MAX/4.
+
 2009-03-27  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* frame.c (x_set_font): If the fullscreen property is non-nil, adjust
diff -r fd3d23f156f5 -r 9e5b3ff07060 src/fileio.c
--- a/src/fileio.c	Fri Mar 27 18:40:04 2009 +0000
+++ b/src/fileio.c	Sat Mar 28 02:06:06 2009 +0000
@@ -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