Changeset 2242 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c

Timestamp:

Jun 29, 2009, 7:19:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3145@localhost: bruno | 2009-06-29 17:18:58 +0200

• Remove 2 memory leaks and change the behavoir for function media_descriptor_string which now allocates the string it returns (which needs to be free by the caller)

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (10 diffs)

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

@@ -1359 +1359 @@
     /*@ buffers ********************************************************* */
     char *tmp;
+    char *mds = NULL;
     char *request;
 
@@ -1410 +1411 @@
         log_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
-        sprintf(tmp, "Insisting on %s #%d",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                cd_number_i_want);
-        sprintf(request, "Please insert %s #%d and press Enter.",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                cd_number_i_want);
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+        sprintf(tmp, "Insisting on %s #%d", mds, cd_number_i_want);
+        sprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
+        mr_free(mds);
         log_msg(3, tmp);
         while (what_number_cd_is_this() != cd_number_i_want) {
@@ -1470 +1469 @@
 {
     char *tmp = NULL;
+    char *mds = NULL;
     char *sz_size;
     char *command;
@@ -1534 +1534 @@
                 finish(1);
             }
-            sprintf(comment, "What speed is your %s (re)writer?",
-                    media_descriptor_string(bkpinfo->backup_media_type));
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
+            sprintf(comment, "What speed is your %s (re)writer?", mds);
             if (bkpinfo->backup_media_type == dvd) {
                 find_dvd_device(bkpinfo->media_device, FALSE);
@@ -1557 +1557 @@
 
             sprintf(comment,
-                    "How much data (in Megabytes) will each %s store?",
-                    media_descriptor_string(bkpinfo->backup_media_type));
+                    "How much data (in Megabytes) will each %s store?", mds);
+            mr_free(mds);
             if (!popup_and_get_string("Size", comment, sz_size, 5)) {
                 log_to_screen("User has chosen not to backup the PC");
@@ -1573 +1573 @@
         /* No break because we continue even for usb */
     case cdstream:
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+
         if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
             strcpy(bkpinfo->media_device, "/dev/cdrom");
@@ -1589 +1591 @@
                         bkpinfo->media_device);
                 sprintf(comment,
-                        "Please specify your %s drive's /dev entry",
-                        media_descriptor_string(bkpinfo->backup_media_type));
+                        "Please specify your %s drive's /dev entry", mds);
                 if (!popup_and_get_string
                     ("Device?", comment, bkpinfo->media_device,
@@ -1598 +1599 @@
                 }
             }
-            log_msg(2, "%s device found at %s",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    bkpinfo->media_device);
+            log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
         } else {
             if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
@@ -1608 +1607 @@
                 if (bkpinfo->backup_media_type == usb) {
                     mr_asprintf(&tmp,
-                        "I think your %s media corresponds to %s. Is this correct?",
-                        media_descriptor_string(bkpinfo->backup_media_type),
+                        "I think your %s media corresponds to %s. Is this correct?", mds,
                         bkpinfo->media_device);
                 } else {
                     mr_asprintf(&tmp,
-                        "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
-                        media_descriptor_string(bkpinfo->backup_media_type),
+                        "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)", mds,
                         bkpinfo->media_device);
                 }
@@ -1647 +1644 @@
             }
         }
+        mr_free(mds);
+
         if (bkpinfo->backup_media_type == cdstream) {
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {