From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 15 Aug 2011 19:23:11 +0000 (-0700)
Subject: * buffer.c (overlay_str_len): Now ptrdiff_t, not EMACS_INT,
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe5c5d37807dbf2d224de5fe9cf821d8292112b1;p=emacs.git

* buffer.c (overlay_str_len): Now ptrdiff_t, not EMACS_INT,

since either will do and ptrdiff_t is convenient with xpalloc.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5954254d149..82851374283 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,9 @@
 
 	Integer and memory overflow issues (Bug#9196).
 
+	* buffer.c (overlay_str_len): Now ptrdiff_t, not EMACS_INT,
+	since either will do and ptrdiff_t is convenient with xpalloc.
+
 	* charset.c (charset_table_size)
 	(struct charset_sort_data.priority): Now ptrdiff_t.
 	(charset_compare): Don't overflow if priorities differ greatly.
diff --git a/src/buffer.c b/src/buffer.c
index b61d083c3e6..5a6484e3105 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2943,7 +2943,7 @@ static struct sortstrlist overlay_heads, overlay_tails;
 static unsigned char *overlay_str_buf;
 
 /* Allocated length of overlay_str_buf.  */
-static EMACS_INT overlay_str_len;
+static ptrdiff_t overlay_str_len;
 
 /* A comparison function suitable for passing to qsort.  */
 static int