Prefer ptrdiff_t to int and avoid integer overflows.

* fileio.c (make_temp_name):
* font.c (font_parse_family_registry): Avoid integer
overflow on string size calculation.
* data.c (Faset): Likewise for byte index.

diff --git a/src/ChangeLog b/src/ChangeLog
index fe771fd8f747bf28517536d0372c0972f015b80a..915a53f7e6e83706089ea98a65c0eefee7b24a80 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,6 +9,12 @@
        (apply_lambda): Likewise.  Get current specpdl level as 3rd arg.
        (do_debug_on_call): Get current specpdl level as 2nd arg.
 
+       Prefer ptrdiff_t to int and avoid integer overflows.
+       * fileio.c (make_temp_name):
+       * font.c (font_parse_family_registry): Avoid integer
+       overflow on string size calculation.
+       * data.c (Faset): Likewise for byte index.
+
 2014-09-15  Eli Zaretskii  <eliz@gnu.org>
 
        Fix display of R2L lines in partial-width windows.

diff --git a/src/data.c b/src/data.c
index 5aeb24b16dcf2324003cb98eeda688f587b6417e..f02b4588ad0af951cf03028059d023347b20a6e6 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -2248,7 +2248,7 @@ bool-vector.  IDX starts at 0.  */)
        {
          if (! SINGLE_BYTE_CHAR_P (c))
            {
-             int i;
+             ptrdiff_t i;
 
              for (i = SBYTES (array) - 1; i >= 0; i--)
                if (SREF (array, i) >= 0x80)

diff --git a/src/fileio.c b/src/fileio.c
index 261928dd821aafe87b0f9600dd78debbf264c704..b4653017b282fbba1b22f0f4aedb355cdd7a71e9 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -733,7 +733,7 @@ Lisp_Object
 make_temp_name (Lisp_Object prefix, bool base64_p)
 {
   Lisp_Object val, encoded_prefix;
-  int len;
+  ptrdiff_t len;
   printmax_t pid;
   char *p, *data;
   char pidbuf[INT_BUFSIZE_BOUND (printmax_t)];

diff --git a/src/font.c b/src/font.c
index afa138003f25571788d2b6ccc006019a3aae4771..470fa1adc11b0121114a96f3f00eaa860a646667 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -1724,7 +1724,7 @@ font_parse_name (char *name, ptrdiff_t namelen, Lisp_Object font)
 void
 font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Object font_spec)
 {
-  int len;
+  ptrdiff_t len;
   char *p0, *p1;
 
   if (! NILP (family)