commit 449041d4db1f82f281fe097e832f07cd9ee1e864
author Kevin Wolf <kwolf@redhat.com> Fri Jun 18 18:27:03 2010 +0200
committer Aurelien Jarno <aurelien@aurel32.net> Wed Jun 30 22:58:55 2010 +0200
tree c5b190cace7dc0d7b1f60fe6aebc87a1d399d0e9
parent b373a63a2eb3a8354de2f75670484bd98966ccb4

qdev-properties: Fix (u)intXX parsers

scanf calls must not use PRI constants, they have probably the wrong size and
corrupt memory. We could replace them by SCN ones, but strtol is simpler than
scanf here anyway. While at it, also fix the parsers to reject garbage after
the number ("4096xyz" was accepted before).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Richard Henderson <rth@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

hw/qdev-properties.c

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 5a8739d..5b7fd77 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -67,12 +67,14 @@
 static int parse_uint8(DeviceState *dev, Property *prop, const char *str)
 {
     uint8_t *ptr = qdev_get_prop_ptr(dev, prop);
-    const char *fmt;
+    char *end;
 
     /* accept both hex and decimal */
-    fmt = strncasecmp(str, "0x",2) == 0 ? "%" PRIx8 : "%" PRIu8;
-    if (sscanf(str, fmt, ptr) != 1)
+    *ptr = strtoul(str, &end, 0);
+    if ((*end != '\0') || (end == str)) {
         return -EINVAL;
+    }
+
     return 0;
 }
 
@@ -95,12 +97,14 @@
 static int parse_uint16(DeviceState *dev, Property *prop, const char *str)
 {
     uint16_t *ptr = qdev_get_prop_ptr(dev, prop);
-    const char *fmt;
+    char *end;
 
     /* accept both hex and decimal */
-    fmt = strncasecmp(str, "0x",2) == 0 ? "%" PRIx16 : "%" PRIu16;
-    if (sscanf(str, fmt, ptr) != 1)
+    *ptr = strtoul(str, &end, 0);
+    if ((*end != '\0') || (end == str)) {
         return -EINVAL;
+    }
+
     return 0;
 }
 
@@ -123,12 +127,14 @@
 static int parse_uint32(DeviceState *dev, Property *prop, const char *str)
 {
     uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
-    const char *fmt;
+    char *end;
 
     /* accept both hex and decimal */
-    fmt = strncasecmp(str, "0x",2) == 0 ? "%" PRIx32 : "%" PRIu32;
-    if (sscanf(str, fmt, ptr) != 1)
+    *ptr = strtoul(str, &end, 0);
+    if ((*end != '\0') || (end == str)) {
         return -EINVAL;
+    }
+
     return 0;
 }
 
@@ -149,9 +155,13 @@
 static int parse_int32(DeviceState *dev, Property *prop, const char *str)
 {
     int32_t *ptr = qdev_get_prop_ptr(dev, prop);
+    char *end;
 
-    if (sscanf(str, "%" PRId32, ptr) != 1)
+    *ptr = strtol(str, &end, 10);
+    if ((*end != '\0') || (end == str)) {
         return -EINVAL;
+    }
+
     return 0;
 }
 
@@ -174,9 +184,13 @@
 static int parse_hex32(DeviceState *dev, Property *prop, const char *str)
 {
     uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
+    char *end;
 
-    if (sscanf(str, "%" PRIx32, ptr) != 1)
+    *ptr = strtoul(str, &end, 16);
+    if ((*end != '\0') || (end == str)) {
         return -EINVAL;
+    }
+
     return 0;
 }
 
@@ -199,12 +213,14 @@
 static int parse_uint64(DeviceState *dev, Property *prop, const char *str)
 {
     uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
-    const char *fmt;
+    char *end;
 
     /* accept both hex and decimal */
-    fmt = strncasecmp(str, "0x",2) == 0 ? "%" PRIx64 : "%" PRIu64;
-    if (sscanf(str, fmt, ptr) != 1)
+    *ptr = strtoull(str, &end, 0);
+    if ((*end != '\0') || (end == str)) {
         return -EINVAL;
+    }
+
     return 0;
 }
 
@@ -227,9 +243,13 @@
 static int parse_hex64(DeviceState *dev, Property *prop, const char *str)
 {
     uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
+    char *end;
 
-    if (sscanf(str, "%" PRIx64, ptr) != 1)
+    *ptr = strtoull(str, &end, 16);
+    if ((*end != '\0') || (end == str)) {
         return -EINVAL;
+    }
+
     return 0;
 }