Changeset 4300

Timestamp:

03/09/10 20:43:13 (6 months ago)

Author:

matwad

Message:

Move extended strtod to string.c, also renamed it from strntod to strtod_ex as it does not have any limit argument.
Fixed buffer overrun when copying into temp buffer

Location:

trunk/showtime/src

Files:

• htsmsg/htsmsg_json.c (modified) (3 diffs)
• misc/string.c (modified) (2 diffs)
• misc/string.h (modified) (1 diff)

trunk/showtime/src/htsmsg/htsmsg_json.c

@@ -26 +26 @@
 #include "htsmsg_json.h"
 #include "htsbuf.h"
+#include "misc/string.h"
 
 /**
@@ -331 +332 @@
 }
 
-/* 
- * locale independent strtod.
- * does not support hex floats as the standard strtod
- */
-static double
-_strntod(const char *s, char decimal_point_char, char **ep)
-{
-  static char locale_decimal_point_char = 0;
-  char buf[64];
-  const char *c;
-  double d;
-  
-  /* ugly but very portable way to get decimal point char */ 
-  if(locale_decimal_point_char == 0) {
-    snprintf(buf, sizeof(buf), "%f", 0.0);
-    locale_decimal_point_char = buf[1];
-    assert(locale_decimal_point_char != 0);
-  }
-  
-  for(c = s; 
-      *c != '\0' &&
-      ((*c > 0 && *c < 33) || /* skip whitespace */
-       (*c == decimal_point_char || strchr("+-0123456789", *c) != NULL)); c++)
-    ;
-  
-  strncpy(buf, s, c - s); 
-  buf[c - s] = '\0';
-  
-  /* replace if specified char is not same as current locale */
-  if(decimal_point_char != locale_decimal_point_char) {
-    char *r = strchr(buf, decimal_point_char);
-    if(r != NULL)
-      *r = locale_decimal_point_char;
-  }
-  
-  d = strtod(buf, ep);
-  
-  /* figure out offset in original string */
-  if(ep != NULL)
-    *ep = (char *)s + (*ep - buf);
-  
-  return d;
-}
-
 /**
  *
@@ -382 +339 @@
 {
   char *ep;
-  double d = _strntod(s, '.', &ep);
+  double d = strtod_ex(s, '.', &ep);
 
   if(ep == s)

trunk/showtime/src/misc/string.c

@@ -21 +21 @@
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include <libavutil/avstring.h>
@@ -489 +490 @@
 }
 
+/* 
+ * locale independent strtod.
+ * does not support hex floats as the standard strtod
+ */
+double
+strtod_ex(const char *s, char decimal_point_char, char **ep)
+{
+  static char locale_decimal_point_char = 0;
+  char buf[64];
+  const char *c;
+  double d;
+  
+  /* ugly but very portable way to get local decimal point char */ 
+  if(locale_decimal_point_char == 0) {
+    snprintf(buf, sizeof(buf), "%f", 0.0);
+    locale_decimal_point_char = buf[1];
+    assert(locale_decimal_point_char != 0);
+  }
+  
+  for(c = s; 
+      *c != '\0' &&
+      ((*c > 0 && *c < 33) || /* skip whitespace */
+       (*c == decimal_point_char || strchr("+-0123456789", *c) != NULL)); c++)
+    ;
+  
+  int n = MIN(sizeof(buf) - 1, c - s);
+  strncpy(buf, s, n); 
+  buf[n] = '\0';
+  
+  /* replace if specified char is not same as current locale */
+  if(decimal_point_char != locale_decimal_point_char) {
+    char *r = strchr(buf, decimal_point_char);
+    if(r != NULL)
+      *r = locale_decimal_point_char;
+  }
+  
+  d = strtod(buf, ep);
+  
+  /* figure out offset in original string */
+  if(ep != NULL)
+    *ep = (char *)s + (*ep - buf);
+  
+  return d;
+}
+

trunk/showtime/src/misc/string.h

@@ -18 +18 @@
           const char *url);
 
+double strtod_ex(const char *s, char decimal_point_char, char **ep);
+
+
 #endif