Changeset 2242 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-string.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-string.c (modified) (3 diffs)

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

@@ -1092 +1092 @@
     static char outstr[MAX_STR_LEN];
     char *pos_w_commas, *tmp;
+    char *mds = NULL;
 
     assert(bkpinfo != NULL);
@@ -1122 +1123 @@
             (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 /
                    bkpinfo->media_size[g_current_media_number]);
-        sprintf(outstr, "%s %d: [",
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+        sprintf(outstr, "%s %d: [", mds, g_current_media_number);
+        mr_free(mds);
     }
     for (j = 0; j < percentage; j += 5) {
@@ -1146 +1147 @@
  */
 /* BCO/BERLIOS change that function to allocate memory, return a pointer and modify caller to free the mem */
-char *media_descriptor_string(t_bkptype type_of_bkp)
-{
-    static char *type_of_backup = NULL;
-
-    if (!type_of_backup) {
-        malloc_string(type_of_backup);
-    }
+char *media_descriptor_string(t_bkptype type_of_bkp) {
+
+    char *type_of_backup = NULL;
 
     switch (type_of_bkp) {
     case dvd:
-        strcpy(type_of_backup, "DVD");
+        mr_asprintf(&type_of_backup, "DVD");
         break;
     case cdr:
-        strcpy(type_of_backup, "CDR");
+        mr_asprintf(&type_of_backup, "CDR");
         break;
     case cdrw:
-        strcpy(type_of_backup, "CDRW");
+        mr_asprintf(&type_of_backup, "CDRW");
         break;
     case tape:
-        strcpy(type_of_backup, "tape");
+        mr_asprintf(&type_of_backup, "tape");
         break;
     case cdstream:
-        strcpy(type_of_backup, "CDR");
+        mr_asprintf(&type_of_backup, "CDR");
         break;
     case udev:
-        strcpy(type_of_backup, "udev");
+        mr_asprintf(&type_of_backup, "udev");
         break;
     case iso:
-        strcpy(type_of_backup, "ISO");
+        mr_asprintf(&type_of_backup, "ISO");
         break;
     case nfs:
-        strcpy(type_of_backup, "nfs");
+        mr_asprintf(&type_of_backup, "nfs");
         break;
     case usb:
-        strcpy(type_of_backup, "USB");
+        mr_asprintf(&type_of_backup, "USB");
         break;
     default:
-        strcpy(type_of_backup, "ISO");
+        mr_asprintf(&type_of_backup, "ISO");
     }
     return (type_of_backup);