Changeset 2237 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-mountlist.c

Timestamp:

Jun 19, 2009, 9:10:17 PM (15 years ago)

Author:

Bruno Cornec

Message:

Fix a bug (seg fault) when a too large mountlist was used. Increased MAXIMUM_DISKS_PER_RAID_DEV which serve as table allocation for drivelist, which should be as big as mountlist in fact ! (which it is still not, but is now sufficently large to be correct). Again dynamic memory allocation is the solution. Or perl ;-)

File:

• branches/2.2.9/mondo/src/common/libmondo-mountlist.c (modified) (2 diffs)

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

@@ -678 +678 @@
         log_msg(8, "Putting %s with size %lli in list of drives", drive, size);
 
+        /* memory allocation */
         truncdrive = truncate_to_drive_name(drive);
+        paranoid_free(drive);
+
         log_msg(8, "drive truncated to %s", truncdrive);
 
@@ -687 +690 @@
         }
         if (j == noof_drives) {
-            strncpy(drivelist->el[noof_drives].device, drive, 63);
+            strncpy(drivelist->el[noof_drives].device, truncdrive, 63);
             drivelist->el[noof_drives].device[63] = '\0';
             log_msg(8,"Adding drive %s to list", drivelist->el[noof_drives].device);
             noof_drives++;
         }
-        paranoid_free(drive);
         paranoid_free(truncdrive);
+        if (noof_drives >= MAXIMUM_DISKS_PER_RAID_DEV) {
+            log_msg(0, "Unable to handle mountlist with more than %d lines", MAXIMUM_DISKS_PER_RAID_DEV);
+            log_to_screen("Unable to handle a so big mountlist");
+            finish(1);
+        }
     }
     drivelist->entries = noof_drives;