[Emacs-diffs] emacs-24 r117503: Prefer ptrdiff_t to int and avoid integer overflows.

[Dmitry Antipov]

------------------------------------------------------------
revno: 117503
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-09-16 08:07:51 +0400
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/data.c                     data.c-20091113204419-o5vbwnq5f7feedwu-251
  src/fileio.c                   fileio.c-20091113204419-o5vbwnq5f7feedwu-210
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-16 04:04:56 +0000
+++ b/src/ChangeLog     2014-09-16 04:07:51 +0000
@@ -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  <address@hidden>
 
        Fix display of R2L lines in partial-width windows.

=== modified file 'src/data.c'
--- a/src/data.c        2014-09-04 15:09:49 +0000
+++ b/src/data.c        2014-09-16 04:07:51 +0000
@@ -2248,7 +2248,7 @@
        {
          if (! SINGLE_BYTE_CHAR_P (c))
            {
-             int i;
+             ptrdiff_t i;
 
              for (i = SBYTES (array) - 1; i >= 0; i--)
                if (SREF (array, i) >= 0x80)

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2014-08-11 00:38:19 +0000
+++ b/src/fileio.c      2014-09-16 04:07:51 +0000
@@ -733,7 +733,7 @@
 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)];

=== modified file 'src/font.c'
--- a/src/font.c        2014-06-19 03:21:07 +0000
+++ b/src/font.c        2014-09-16 04:07:51 +0000
@@ -1724,7 +1724,7 @@
 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)