Changeset 115 in MondoRescue

Timestamp:

Nov 6, 2005, 3:18:38 PM (20 years ago)

Author:

andree

Message:

free variable after it has been used in call to log_to_screen() rather
than before. Fixes segmentation fault in mondorestore.

File:

• trunk/mondo/mondo/mondorestore/mondo-prep.c (modified) (3 diffs)

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -1811 +1811 @@
     } else {
         /* MBR needs an extended partition if more than 4 partitions */
-        if (strcmp(part_table_fmt,"MBR") == 0) {
+        if (strcmp(part_table_fmt, "MBR") == 0) {
             if (partno == 5) {
                 if (prev_partno >= 4) {
-                    log_to_screen("You need to leave at least one partition free, for 'extended/logical'");
+                    log_to_screen
+                        ("You need to leave at least one partition free, for 'extended/logical'");
                     paranoid_free(program);
                     paranoid_free(partition_name);
@@ -1822 +1823 @@
                     return (1);
                 } else {
-                    sprintf(output + strlen(output), "n\ne\n%d\n\n\n", prev_partno + 1);
+                    sprintf(output + strlen(output), "n\ne\n%d\n\n\n",
+                            prev_partno + 1);
                 }
             }
@@ -2590 +2592 @@
     final_size = get_phys_size_of_drive(drive_name);
     sprintf(tmp, "final_size = %ld MB", final_size);
+    log_to_screen(tmp);
     paranoid_free(tmp);
-    log_to_screen(tmp);
 }