Changeset 3618 in MondoRescue for branches/3.2

Timestamp:

Dec 18, 2016, 12:19:56 AM (7 years ago)

Author:

Bruno Cornec

Message:

• Fix mr_popup_and_get_string which was using a freed string by newtFormDestroy. String is now duplicated.

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-tools.c (modified) (1 diff)
• newt-specific.c (modified) (2 diffs)

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

@@ -983 +983 @@
     }
     run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    tmp = call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\"");
+    tmp = call_program_and_get_last_line_of_output("mount | grep -E 'cdr(om|w)'");
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {

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

@@ -768 +768 @@
     b_res = newtRunForm(myForm);
 
+    if (b_res != b_2) {
+        /*  We need to copy the value as newtFormDestroy will clear entry_value */
+        mr_asprintf(out, "%s", entry_value);
+    }
     newtPopHelpLine();
     newtFormDestroy(myForm);
@@ -773 +777 @@
     mr_free(blurb);
 
-    if (b_res != b_2) {
-        out = entry_value;
-    }
     return(out);
 }