Bug 330603 – pango_scan_int invokes undefined behaviour

2006-07-10  Behdad Esfahbod  <behdad@gnome.org>

        Bug 330603 – pango_scan_int invokes undefined behaviour

        * pango/pango-utils.c (pango_scan_int): Use strtol.

diff --git a/ChangeLog b/ChangeLog
index 01df55e..abbcaf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-07-10  Behdad Esfahbod  <behdad@gnome.org>
 
+       Bug 330603 – pango_scan_int invokes undefined behaviour
+
+       * pango/pango-utils.c (pango_scan_int): Use strtol.
+
+2006-07-10  Behdad Esfahbod  <behdad@gnome.org>
+
        Bug 315599 – PangoAttribute remains in wrong context.
 
        * pango/pangocairo-render.c (_pango_cairo_do_glyph_string): Rever my

diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 70f32db..63976ae 100644 (file)
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -412,8 +412,7 @@ pango_scan_string (const char **pos, GString *out)
  * @pos: in/out string position
  * @out: an int into which to write the result
  * 
- * Scans an integer. An integer consists
- * of up to 31 decimal digits. 
+ * Scans an integer. 
  * Leading white space is skipped.
  * 
  * Return value: %FALSE if a parse error occured.
@@ -422,29 +421,24 @@ gboolean
 pango_scan_int (const char **pos, int *out)
 {
   unsigned int i = 0;
-  char buf[32];
-  const char *p = *pos;
-
-  while (g_ascii_isspace (*p))
-    p++;
-  
-  if (*p < '0' || *p > '9')
-    return FALSE;
+  char *end;
+  long temp;
 
-  while ((*p >= '0') && (*p <= '9') && i < sizeof(buf))
+  errno = 0;
+  temp = strtol (*pos, &end, 10);
+  if (errno == ERANGE)
     {
-      buf[i] = *p;
-      i++;
-      p++;
+      errno = 0;
+      return FALSE;
+    }
+       
+  *out = (int)temp;
+  if ((long)(*out) != temp)
+    {
+      return FALSE;
     }
 
-  if (i == sizeof(buf))
-    return FALSE;
-  else
-    buf[i] = '\0';
-
-  *out = atoi (buf);
-  *pos = p;
+  *pos = end;
 
   return TRUE;
 }