Changeset 740 for vendor/current/source4/lib/registry/patchfile_preg.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/lib/registry/patchfile_preg.c (modified) (12 diffs)

vendor/current/source4/lib/registry/patchfile_preg.c

@@ -34 +34 @@
         uint16_t v;
 
-        if (read(fd, &v, 2) < 2) {
+        if (read(fd, &v, ) {
                 return WERR_GENERAL_FAILURE;
         }
@@ -42 +42 @@
 static WERROR preg_write_utf16(int fd, const char *string)
 {
-        codepoint_t v;
-        uint16_t i;
-        size_t size;
+        uint16_t v;
+        size_t i, size;
 
         for (i = 0; i < strlen(string); i+=size) {
                 v = next_codepoint(&string[i], &size);
-                if (write(fd, &v, 2) < 2) {
+                if (write(fd, &v, ) {
                         return WERR_GENERAL_FAILURE;
                 }
@@ -89 +88 @@
         char *parent_name;
         DATA_BLOB blob;
-
-        parent_name = talloc_strndup(data->ctx, key_name, strrchr(key_name, '\\')-key_name);
-        blob.data = (uint8_t *)talloc_strndup(data->ctx, key_name+(strrchr(key_name, '\\')-key_name)+1,
-                        strlen(key_name)-(strrchr(key_name, '\\')-key_name));
+        WERROR werr;
+
+        parent_name = talloc_strndup(data->ctx, key_name,
+                                     strrchr(key_name, '\\')-key_name);
+        W_ERROR_HAVE_NO_MEMORY(parent_name);
+        blob.data = (uint8_t*)talloc_strndup(data->ctx,
+                                             key_name+(strrchr(key_name, '\\')-key_name)+1,
+                                             strlen(key_name)-(strrchr(key_name, '\\')-key_name));
+        W_ERROR_HAVE_NO_MEMORY(blob.data);
         blob.length = strlen((char *)blob.data)+1;
         
 
         /* FIXME: These values should be accumulated to be written at done(). */
-        return reg_preg_diff_set_value(data, parent_name, "**DeleteKeys", REG_SZ, blob);
+        werr = reg_preg_diff_set_value(data, parent_name, "**DeleteKeys",
+                                       REG_SZ, blob);
+
+        talloc_free(parent_name);
+        talloc_free(blob.data);
+
+        return werr;
 }
 
@@ -106 +116 @@
         char *val;
         DATA_BLOB blob;
+
 
         val = talloc_asprintf(data->ctx, "**Del.%s", value_name);
-
+        W_ERROR_HAVE_NO_MEMORY(val);
         blob.data = (uint8_t *)talloc(data->ctx, uint32_t);
-        *(uint32_t *)blob.data = 0;
-        blob.length = 4;
-        return reg_preg_diff_set_value(data, key_name, val, REG_DWORD, blob);
+        W_ERROR_HAVE_NO_MEMORY(blob.data);
+        SIVAL(blob.data, 0, 0);
+        blob.length = sizeof(uint32_t);
+
+        werr = reg_preg_diff_set_value(data, key_name, val, REG_DWORD, blob);
+
+        talloc_free(val);
+        talloc_free(blob.data);
+
+        return werr;
 }
 
@@ -119 +137 @@
         struct preg_data *data = (struct preg_data *)_data;
         DATA_BLOB blob;
+
 
         blob.data = (uint8_t *)talloc(data->ctx, uint32_t);
-        *(uint32_t *)blob.data = 0;     
-        blob.length = 4;
-
-        return reg_preg_diff_set_value(data, key_name, "**DelVals.", REG_DWORD, blob);
+        W_ERROR_HAVE_NO_MEMORY(blob.data);
+        SIVAL(blob.data, 0, 0);
+        blob.length = sizeof(uint32_t);
+
+        werr = reg_preg_diff_set_value(data, key_name, "**DelVals.", REG_DWORD,
+                                       blob);
+
+        talloc_free(blob.data);
+
+        return werr;
 }
 
@@ -140 +165 @@
  */
 _PUBLIC_ WERROR reg_preg_diff_save(TALLOC_CTX *ctx, const char *filename,
-                                   struct smb_iconv_convenience *ic,
                                    struct reg_diff_callbacks **callbacks,
                                    void **callback_data)
@@ -165 +189 @@
 
         strncpy(preg_header.hdr, "PReg", 4);
-        SIVAL(&preg_header, 4, 1);
-        write(data->fd, (uint8_t *)&preg_header,8);
+        SIVAL(&preg_header, 1);
+        write(data->fd, (uint8_t *)&preg_header,);
 
         data->ctx = ctx;
@@ -185 +209 @@
  */
 _PUBLIC_ WERROR reg_preg_diff_load(int fd,
-                                   struct smb_iconv_convenience *iconv_convenience, 
                                    const struct reg_diff_callbacks *callbacks,
                                    void *callback_data)
@@ -206 +229 @@
 
         /* Read first 8 bytes (the header) */
-        if (read(fd, &preg_header, 8) != 8) {
+        if (read(fd, &preg_header, ) {
                 DEBUG(0, ("Could not read PReg file: %s\n",
                                 strerror(errno)));
@@ -255 +278 @@
 
                 /* Get the type */
-                if (read(fd, &value_type, 4) < 4) {
+                if (read(fd, &value_type, ) {
                         DEBUG(0, ("Error while reading PReg\n"));
                         ret = WERR_GENERAL_FAILURE;
@@ -270 +293 @@
                         goto cleanup;
                 }
+
                 /* Get data length */
-                if (read(fd, &length, 4) < 4) {
+                if (read(fd, &length, ) {
                         DEBUG(0, ("Error while reading PReg\n"));
                         ret = WERR_GENERAL_FAILURE;
                         goto cleanup;
                 }
+
+
                 /* Read past delimiter */
                 buf_ptr = buf;
@@ -284 +310 @@
                         goto cleanup;
                 }
+
                 /* Get the data */
                 buf_ptr = buf;