* font.c (font_intern_prop): Don't assume string length fits in int.

Don't assume integer property fits in fixnum.
* font.h (font_intern_prop): 2nd arg is now ptrdiff_t, not int.

diff --git a/src/ChangeLog b/src/ChangeLog
index 32756b4427f893745256bb25f6e0baafae91f361..cb6ea8ff9eb6c547b86e461d8807b9b1c08487b9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,9 @@
        * font.c: Don't assume string length fits in int.
        (font_parse_xlfd, font_parse_fcname, font_unparse_fcname):
        Use ptrdiff_t, not int.
+       (font_intern_prop): Don't assume string length fits in int.
+       Don't assume integer property fits in fixnum.
+       * font.h (font_intern_prop): 2nd arg is now ptrdiff_t, not int.
 
        * filelock.c: Fix some buffer overrun and integer overflow issues.
        (get_boot_time): Don't assume that gzip command string fits in 100 bytes.

diff --git a/src/font.c b/src/font.c
index b9cdde376a5e656aa03a66bd3b4a08abc860f42e..cc57af12141975bbe26230b928c070eae516eebb 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -232,9 +232,9 @@ static int num_font_drivers;
    STR.  */
 
 Lisp_Object
-font_intern_prop (const char *str, int len, int force_symbol)
+font_intern_prop (const char *str, ptrdiff_t len, int force_symbol)
 {
-  int i;
+  ptrdiff_t i;
   Lisp_Object tem;
   Lisp_Object obarray;
   EMACS_INT nbytes, nchars;
@@ -247,7 +247,12 @@ font_intern_prop (const char *str, int len, int force_symbol)
        if (! isdigit (str[i]))
          break;
       if (i == len)
-       return make_number (atoi (str));
+       {
+         Lisp_Object num = string_to_number (str, 10, 0);
+         if (! INTEGERP (num))
+           xsignal1 (Qoverflow_error, num);
+         return num;
+       }
     }
 
   /* The following code is copied from the function intern (in

diff --git a/src/font.h b/src/font.h
index 0ca9e8baec48ebb779ed7c568596b4f48a0c2e08..e50eaff9a1fb5fc9b68b0124796abcabea1908d1 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -777,7 +777,8 @@ extern void font_done_for_face (FRAME_PTR f, struct face *face);
 extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec);
 extern Lisp_Object font_open_by_name (FRAME_PTR f, const char *name);
 
-extern Lisp_Object font_intern_prop (const char *str, int len, int force_symbol);
+extern Lisp_Object font_intern_prop (const char *str, ptrdiff_t len,
+                                    int force_symbol);
 extern void font_update_sort_order (int *order);
 
 extern void font_parse_family_registry (Lisp_Object family,