Changeset 3263 in MondoRescue for branches/3.2/mondo/src/common/libmondo-mountlist.c

Timestamp:

Apr 22, 2014, 11:06:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug due to lack of memory allocation for a tmp var to display
• Fix another bug in the call to labeling which used a bad variable

File:

• branches/3.2/mondo/src/common/libmondo-mountlist.c (modified) (6 diffs)

branches/3.2/mondo/src/common/libmondo-mountlist.c

@@ -413 +413 @@
     }
 
+    /* GPT allows more than 4 primary partitions - detect partition type now */
+    part_table_fmt = which_partition_format(drive);
+
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
         build_partition_name(device, drive, curr_part_no);
@@ -428 +431 @@
                 mr_free(tmp);
                 res++;
-            } else if (curr_part_no > 5
-                       || (curr_part_no <= 4 && prev_part_no > 0)) {
+            } else if (curr_part_no > 5 || (curr_part_no <= 4 && prev_part_no > 0)) {
                 mr_asprintf(tmp, " Gap on %s between %d and %d.", drive, prev_part_no, curr_part_no);
                 log_it(tmp);
@@ -437 +439 @@
             }
         }
-        /* GPT allows more than 4 primary partitions */
-        part_table_fmt = which_partition_format(drive);
         /* no spare primary partitions to help accommodate the logical(s)? */
         if ((curr_part_no >= 5 && prev_part_no == 4) && (strcmp(part_table_fmt, "MBR") == 0)) {
@@ -447 +447 @@
             res++;
         }
-        mr_free(part_table_fmt);
 
         /* does partition /dev/hdNX exist more than once in the mountlist? */
@@ -498 +497 @@
         prev_part_no = curr_part_no;
     }
+    mr_free(part_table_fmt);
 
     /* Over-allocated the disk? Unallocated space on disk? */
@@ -589 +589 @@
             }
         }
-        if (copies > 1 && last_copy == currline
-            && strcmp(curr_mountpoint, "raid")) {
+        if (copies > 1 && last_copy == currline && strcmp(curr_mountpoint, "raid")) {
             mr_asprintf(tmp, " %s %s's.", number_to_text(copies), curr_mountpoint);
             mr_strcat(flaws_str, "%s", tmp);