source4: Use wrapper for string to integer conversion

[sfrench/samba-autobuild/.git] / source4 / lib / registry / ldb.c

diff --git a/source4/lib/registry/ldb.c b/source4/lib/registry/ldb.c
index 8bb6fd5c10f2006352e846552026d6d1745311b1..ec293c46149b6c2bea8688d3e532c4e9e1a3b606 100644 (file)
--- a/source4/lib/registry/ldb.c
+++ b/source4/lib/registry/ldb.c
@@ -75,8 +75,16 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx,
        case REG_DWORD:
        case REG_DWORD_BIG_ENDIAN:
                if (val != NULL) {
+                       int error = 0;
                        /* The data is a plain DWORD */
-                       uint32_t tmp = strtoul((char *)val->data, NULL, 0);
+                       uint32_t tmp;
+
+                       tmp = strtoul_err((char *)val->data, NULL, 0, &error);
+                       if (error != 0) {
+                               data->data = NULL;
+                               data->length = 0;
+                               break;
+                       }
                        data->data = talloc_size(mem_ctx, sizeof(uint32_t));
                        if (data->data != NULL) {
                                SIVAL(data->data, 0, tmp);
@@ -90,8 +98,16 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx,
 
        case REG_QWORD:
                if (val != NULL) {
+                       int error = 0;
                        /* The data is a plain QWORD */
-                       uint64_t tmp = strtoull((char *)val->data, NULL, 0);
+                       uint64_t tmp;
+
+                       tmp = strtoull_err((char *)val->data, NULL, 0, &error);
+                       if (error != 0) {
+                               data->data = NULL;
+                               data->length = 0;
+                               break;
+                       }
                        data->data = talloc_size(mem_ctx, sizeof(uint64_t));
                        if (data->data != NULL) {
                                SBVAL(data->data, 0, tmp);