From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 2 Apr 2011 07:40:13 +0000 (-0700)
Subject: * minibuf.c (read_minibuf_noninteractive): Use size_t for sizes.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~53
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a37c69bff68c15220b7f737a721ff7e1d3291b9e;p=emacs.git

* minibuf.c (read_minibuf_noninteractive): Use size_t for sizes.

Check for integer overflow on size calculations.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a470962d74d..73be884837f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-02  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* minibuf.c (read_minibuf_noninteractive): Use size_t for sizes.
+	Check for integer overflow on size calculations.
+
 	* buffer.c (Fprevious_overlay_change): Remove var that is set
 	but not used.
 
diff --git a/src/minibuf.c b/src/minibuf.c
index 4adf665f8f4..54cb9c1acd7 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -229,7 +229,7 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
 			     Lisp_Object defalt,
 			     int allow_props, int inherit_input_method)
 {
-  int size, len;
+  size_t size, len;
   char *line, *s;
   Lisp_Object val;
 
@@ -244,6 +244,8 @@ read_minibuf_noninteractive (Lisp_Object map, Lisp_Object initial,
 	 && (len = strlen (line),
 	     len == size - 1 && line[len - 1] != '\n'))
     {
+      if ((size_t) -1 / 2 < size)
+	memory_full ();
       size *= 2;
       line = (char *) xrealloc (line, size);
     }