* alloc.c (staticpro): Avoid buffer overrun on repeated calls.

(NSTATICS): Now a constant; doesn't need to be a macro.

diff --git a/src/ChangeLog b/src/ChangeLog
index 975bcaaba0e1c698254e5efcbd933d4e6fb8b453..73e24bcf8291cfcae1ca8b7faeaa9b71adc0c342 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-19  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * alloc.c (staticpro): Avoid buffer overrun on repeated calls.
+       (NSTATICS): Now a constant; doesn't need to be a macro.
+
 2013-07-19  Richard Stallman  <rms@gnu.org>
 
        * coding.c (decode_coding_utf_8): Add simple loop for fast

diff --git a/src/alloc.c b/src/alloc.c
index 11245741bd591838376f64b6610a8ec868f92001..4c924f7238462d8d9c21567f5682ab88d5f6e4b6 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -341,7 +341,7 @@ struct gcpro *gcprolist;
 /* Addresses of staticpro'd variables.  Initialize it to a nonzero
    value; otherwise some compilers put it into BSS.  */
 
-#define NSTATICS 0x800
+enum { NSTATICS = 2048 };
 static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag};
 
 /* Index of next unused slot in staticvec.  */
@@ -5136,9 +5136,9 @@ Does not copy symbols.  Copies strings without text properties.  */)
 void
 staticpro (Lisp_Object *varaddress)
 {
-  staticvec[staticidx++] = varaddress;
   if (staticidx >= NSTATICS)
     fatal ("NSTATICS too small; try increasing and recompiling Emacs.");
+  staticvec[staticidx++] = varaddress;
 }
 
 \f