* lisp.h (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Avoid 'int' overflow

leading to a memory leak, possible in functions like
load_charset_map_from_file that can allocate an unbounded number
of objects.

diff --git a/src/ChangeLog b/src/ChangeLog
index c8fa1e55695e958cdeda1d70caafc85d9f5de7e3..a341d1b467831c54c8ab1d11d6f5a22e49133678 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2011-03-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * lisp.h (SAFE_ALLOCA, SAFE_ALLOCA_LISP): Avoid 'int' overflow
+       leading to a memory leak, possible in functions like
+       load_charset_map_from_file that can allocate an unbounded number
+       of objects.
+
        * xmenu.c (set_frame_menubar): Use EMACS_UINT, not int, for indexes
        that could (at least in theory) be that large.
 

diff --git a/src/lisp.h b/src/lisp.h
index 645b82c80cf11ca712397d198da81d844f4891de..e98172ec104ea803d26381aa2a87c25dc930b7f0 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3602,7 +3602,7 @@ extern Lisp_Object safe_alloca_unwind (Lisp_Object);
     else                                                 \
       {                                                          \
        buf = (type) xmalloc (size);                      \
-       sa_must_free++;                                   \
+       sa_must_free = 1;                                 \
        record_unwind_protect (safe_alloca_unwind,        \
                               make_save_value (buf, 0)); \
       }                                                          \
@@ -3632,7 +3632,7 @@ extern Lisp_Object safe_alloca_unwind (Lisp_Object);
        buf = (Lisp_Object *) xmalloc (size_);            \
        arg_ = make_save_value (buf, nelt);               \
        XSAVE_VALUE (arg_)->dogc = 1;                     \
-       sa_must_free++;                                   \
+       sa_must_free = 1;                                 \
        record_unwind_protect (safe_alloca_unwind, arg_); \
       }                                                          \
   } while (0)