* 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 5954254d14930ca66ac1c05cc5ac29f0f15b5317..8285137428316b62cad891b67eb2c05880582f69 100644 (file)
--- 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 b61d083c3e6a11ca2d1def513c6702d52f382b8b..5a6484e31050d8e04d63e7d73e43f69993a0e253 100644 (file)
--- 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