Changeset 1873 in MondoRescue

Timestamp:

Jan 21, 2008, 7:16:46 PM (17 years ago)

Author:

Bruno Cornec

Message:

Replace some sprintf by asprintf (searching for a core dumped bug at restore time when dealing with bootloader: asks for writing BL, and fails after)

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (6 diffs)

branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -1468 +1468 @@
   /** malloc *******/
     char *device;
-    char *tmp;
+    char *tmp = NULL;
     char *name;
     char *cmd = NULL;
 
     malloc_string(device);
-    malloc_string(tmp);
     malloc_string(name);
 
@@ -1482 +1481 @@
     asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
     run_program_and_log_output(cmd, 3);
+    paranoid_free(cmd);
 
     backup_crucial_file(MNT_RESTORING, "/etc/fstab");
@@ -1491 +1491 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    sprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);
+    asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
     log_msg(2, tmp);
+    paranoid_free(tmp);
     system("sync");
     if (!strcmp(name, "LILO")) {
@@ -1505 +1506 @@
 #ifdef __FreeBSD__
     else if (!strcmp(name, "BOOT0")) {
-        sprintf(tmp, "boot0cfg -B %s", device);
+        asprintf(&tmp, "boot0cfg -B %s", device);
         res = run_program_and_log_output(tmp, FALSE);
+        paranoid_free(tmp);
     } else {
-        sprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
+        asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
-            sprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            paranoid_free(tmp);
+            asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
@@ -1516 +1519 @@
                     "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
         }
+        paranoid_free(tmp);
     }
 #else
@@ -1531 +1535 @@
     }
     paranoid_free(device);
-    paranoid_free(tmp);
     paranoid_free(name);
     return (retval);