Changeset 3211 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Dec 10, 2013, 8:50:44 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fi a bug with the cfg_file variable which wasn't initialized correctly (strcpy) while managed dynamically

File:

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

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

@@ -655 +655 @@
 
 if (!cfgf) {
-    strcpy(cfg_file, g_mondo_cfg_file);
+    mr_asprintf(cfg_file, "%s", g_mondo_cfg_file);
 } else {
-    strcpy(cfg_file, cfgf);
+    mr_asprintf(cfg_file, "%s", cfgf);
 }
 
@@ -848 +848 @@
 }
 
-read_cfg_var(g_mondo_cfg_file, "please-dont-eject", value);
+read_cfg_var(cfg_file, "please-dont-eject", value);
 if (value[0] || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
     bkpinfo->please_dont_eject = TRUE;
@@ -864 +864 @@
         log_msg(2, "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
     } else {
-        read_cfg_var(g_mondo_cfg_file, "netfs-server-mount", value);
+        read_cfg_var(cfg_file, "netfs-server-mount", value);
         mr_free(bkpinfo->netfs_mount);
         mr_asprintf(bkpinfo->netfs_mount, "%s", value);
 
-        read_cfg_var(g_mondo_cfg_file, "netfs-server-path", value);
+        read_cfg_var(cfg_file, "netfs-server-path", value);
         mr_free(bkpinfo->netfs_remote_dir);
         mr_asprintf(bkpinfo->netfs_remote_dir, "%s", value);
@@ -908 +908 @@
     */
     mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
-    read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
-    read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
+    read_cfg_var(cfg_file, "iso-mnt", iso_mnt);
+    read_cfg_var(cfg_file, "isodir", iso_path);
     sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
     if (!bkpinfo->isodir[0]) {
@@ -920 +920 @@
         }
     }
+    mr_free(old_isodir);
+
     if (g_isodir_device[0] == '\0') {
         /*  We don't want to loose our conf made earlier in iso_fiddly_bits 
          *  so go here only if job not done already */
-        read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
+        read_cfg_var(cfg_file, "iso-dev", g_isodir_device);
     }
 
@@ -965 +967 @@
     }
 }
+mr_free(cfg_file);
 
 if (media_specified_by_user != none) {