Changeset 3235 in MondoRescue for branches

Timestamp:

Jan 3, 2014, 5:44:01 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Revert dynamic memory allocation for blurb variables as they are used in a subroutine in an non-compatible way (Fix one of the core dumped seen at restore time)

File:

• branches/3.2/mondo/src/common/newt-specific.c (modified) (2 diffs)

branches/3.2/mondo/src/common/newt-specific.c

@@ -651 +651 @@
         assert(b3 != NULL);
 
-        mr_asprintf(blurb1, "%s", b1);
-        mr_asprintf(blurb2, "%s", b2);
-        mr_asprintf(blurb3, "%s", b3);
+        malloc_string(blurb1);
+        malloc_string(blurb2);
+        malloc_string(blurb3);
+        strcpy(blurb1, b1);
+        strcpy(blurb2, b2);
+        strcpy(blurb3, b3);
 
         strcpy(b1c, b1);
@@ -687 +690 @@
         update_progress_form_full(blurb1, blurb2, blurb3);
         paranoid_free(b1c);
-        mr_free(blurb1);
-        mr_free(blurb2);
-        mr_free(blurb3);
+        paranoid_free(blurb1);
+        paranoid_free(blurb2);
+        paranoid_free(blurb3);
     }