Changeset 745 for trunk/server/source3/lib/tdb_validate.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)
• source3/lib/tdb_validate.c (modified) (5 diffs)

trunk/server/source3/lib/tdb_validate.c

@@ -20 +20 @@
  */
 
+#include "includes.h"
+#include "system/filesys.h"
+#include "util_tdb.h"
 #include "tdb_validate.h"
-#include "includes.h"
 
 /*
@@ -282 +284 @@
 
         tmp_path = talloc_asprintf(ctx, "%s%s", dst_path, ".tmp");
+        if (!tmp_path) {
+                DEBUG(3, ("talloc fail\n"));
+                goto done;
+        }
+
         unlink(tmp_path);
         dst_tdb = tdb_open_log(tmp_path,
@@ -356 +363 @@
 
         dst_path = talloc_asprintf(ctx, "%s%s", path, suffix);
+        if (dst_path == NULL) {
+                DEBUG(3, ("error out of memory\n"));
+                return ret;
+        }
 
         ret = (rename(path, dst_path) != 0);
@@ -395 +406 @@
                 char *rotate_path = talloc_asprintf(ctx, "%s%s", dst_path,
                                                     rotate_suffix);
+                if (rotate_path == NULL) {
+                        DEBUG(10, ("talloc fail\n"));
+                        return -1;
+                }
                 DEBUG(10, ("backup of %s failed due to lack of space\n",
                            src_path));
@@ -451 +466 @@
 
         tdb_path_backup = talloc_asprintf(ctx, "%s%s", tdb_path, backup_suffix);
+        if (!tdb_path_backup) {
+                DEBUG(0, ("tdb_validate_and_backup: out of memory\n"));
+                goto done;
+        }
 
         ret = tdb_validate_open(tdb_path, validate_fn);