Changeset 745 for trunk/server/source4/lib/registry/dir.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/lib/registry/dir.c (modified) (17 diffs)

trunk/server/source4/lib/registry/dir.c

@@ -41 +41 @@
 
         path = talloc_asprintf(mem_ctx, "%s/%s", dk->path, name);
+        W_ERROR_HAVE_NO_MEMORY(path);
         ret = mkdir(path, 0700);
         if (ret == 0) {
                 struct dir_key *key = talloc(mem_ctx, struct dir_key);
+                W_ERROR_HAVE_NO_MEMORY(key);
                 key->key.ops = &reg_backend_dir;
                 key->path = talloc_steal(key, path);
@@ -77 +79 @@
 
                 path = talloc_asprintf(name, "%s/%s", name, e->d_name);
-                if (!path)
-                        return WERR_NOMEM;
+                W_ERROR_HAVE_NO_MEMORY(path);
 
                 stat(path, &stbuf);
@@ -109 +110 @@
 }
 
-static WERROR reg_dir_del_key(const struct hive_key *k, const char *name)
+static WERROR reg_dir_del_key(TALLOC_CTX *mem_ctx, const struct hive_key *k,
+                              const char *name)
 {
         struct dir_key *dk = talloc_get_type(k, struct dir_key);
-        char *child = talloc_asprintf(NULL, "%s/%s", dk->path, name);
+        char *child;
         WERROR ret;
+
+        child = talloc_asprintf(mem_ctx, "%s/%s", dk->path, name);
+        W_ERROR_HAVE_NO_MEMORY(child);
 
         ret = reg_dir_delete_recursive(child);
@@ -137 +142 @@
 
         fullpath = talloc_asprintf(mem_ctx, "%s/%s", p->path, name);
+        W_ERROR_HAVE_NO_MEMORY(fullpath);
 
         d = opendir(fullpath);
@@ -142 +148 @@
                 DEBUG(3,("Unable to open '%s': %s\n", fullpath,
                         strerror(errno)));
+                talloc_free(fullpath);
                 return WERR_BADFILE;
         }
@@ -160 +167 @@
         struct dirent *e;
         const struct dir_key *dk = talloc_get_type(k, struct dir_key);
-        int i = 0;
+        unsigned int i = 0;
         DIR *d;
 
@@ -174 +181 @@
 
                         /* Check if file is a directory */
-                        asprintf(&thispath, "%s/%s", dk->path, e->d_name);
+                        thispath = talloc_asprintf(mem_ctx, "%s/%s", dk->path,
+                                                   e->d_name);
+                        W_ERROR_HAVE_NO_MEMORY(thispath);
                         stat(thispath, &stbuf);
 
                         if (!S_ISDIR(stbuf.st_mode)) {
-                                SAFE_FREE(thispath);
+                                talloc_free(thispath);
                                 continue;
                         }
@@ -185 +194 @@
                                 struct stat st;
                                 *name = talloc_strdup(mem_ctx, e->d_name);
+                                W_ERROR_HAVE_NO_MEMORY(*name);
                                 *classname = NULL;
                                 stat(thispath, &st);
                                 unix_to_nt_time(last_mod_time, st.st_mtime);
-                                SAFE_FREE(thispath);
+                                talloc_free(thispath);
                                 closedir(d);
                                 return WERR_OK;
@@ -194 +204 @@
                         i++;
 
-                        SAFE_FREE(thispath);
+                        talloc_free(thispath);
                 }
         }
@@ -212 +222 @@
 
         dk = talloc(parent_ctx, struct dir_key);
+        W_ERROR_HAVE_NO_MEMORY(dk);
         dk->key.ops = &reg_backend_dir;
         dk->path = talloc_strdup(dk, location);
@@ -271 +282 @@
                         char *path = talloc_asprintf(ctx, "%s/%s",
                                                      dk->path, e->d_name);
+                        W_ERROR_HAVE_NO_MEMORY(path);
 
                         if (stat(path, &st) < 0) {
                                 DEBUG(0, ("Error statting %s: %s\n", path,
                                         strerror(errno)));
+                                talloc_free(path);
                                 continue;
                         }
@@ -309 +322 @@
 {
         const struct dir_key *dk = talloc_get_type(key, struct dir_key);
-        char *path = talloc_asprintf(dk, "%s/%s", dk->path, name);
-
-        if (!file_save(path, data.data, data.length))
+        char *path;
+        bool ret;
+
+        path = talloc_asprintf(dk, "%s/%s", dk->path, name);
+        W_ERROR_HAVE_NO_MEMORY(path);
+
+        ret = file_save(path, data.data, data.length);
+
+        talloc_free(path);
+
+        if (!ret) {
                 return WERR_GENERAL_FAILURE;
+        }
 
         /* FIXME: Type */
@@ -324 +346 @@
 {
         const struct dir_key *dk = talloc_get_type(key, struct dir_key);
-        char *path = talloc_asprintf(mem_ctx, "%s/%s", dk->path, name);
+        char *path;
         size_t size;
         char *contents;
 
+        path = talloc_asprintf(mem_ctx, "%s/%s", dk->path, name);
+        W_ERROR_HAVE_NO_MEMORY(path);
+
         contents = file_load(path, &size, 0, mem_ctx);
+
         talloc_free(path);
+
         if (contents == NULL)
                 return WERR_BADFILE;
@@ -343 +370 @@
 
 static WERROR reg_dir_enum_value(TALLOC_CTX *mem_ctx,
-                                 struct hive_key *key, int idx,
+                                 struct hive_key *key, uint32_t idx,
                                  const char **name,
                                  uint32_t *type, DATA_BLOB *data)
@@ -350 +377 @@
         DIR *d;
         struct dirent *e;
-        int i;
+        unsigned int i;
 
         d = opendir(dk->path);
@@ -365 +392 @@
 
                 if (i == idx) {
-                        if (name != NULL)
+                        if (name != NULL) {
                                 *name = talloc_strdup(mem_ctx, e->d_name);
+                                W_ERROR_HAVE_NO_MEMORY(*name);
+                        }
                         W_ERROR_NOT_OK_RETURN(reg_dir_get_value(mem_ctx, key,
                                                                 *name, type,
@@ -381 +410 @@
 
 
-static WERROR reg_dir_del_value (struct hive_key *key, const char *name)
+static WERROR reg_dir_del_value(TALLOC_CTX *mem_ctx,
+                                struct hive_key *key, const char *name)
 {
         const struct dir_key *dk = talloc_get_type(key, struct dir_key);
-        char *path = talloc_asprintf(key, "%s/%s", dk->path, name);
-        if (unlink(path) < 0) {
-                talloc_free(path);
+        char *path;
+        int ret;
+
+        path = talloc_asprintf(mem_ctx, "%s/%s", dk->path, name);
+        W_ERROR_HAVE_NO_MEMORY(path);
+
+        ret = unlink(path);
+
+        talloc_free(path);
+
+        if (ret < 0) {
                 if (errno == ENOENT)
                         return WERR_BADFILE;
                 return WERR_GENERAL_FAILURE;
         }
-        talloc_free(path);
 
         return WERR_OK;