Changeset 2352 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Aug 28, 2009, 2:46:29 AM (15 years ago)

Author:

Bruno Cornec

Message:

Change inerface of evaluate_mountlist and spread_flaws_across_three_lines in order to solve bugs linked to strings management in these functions. May fix a restoration crash seen by some customers (backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (5 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1924 +1924 @@
     /** int **************************************************************/
     int i = 0;
+    int res = 0;
     int currline = 0;
     int finished = FALSE;
@@ -1929 +1930 @@
     /** buffers **********************************************************/
     char *tmp = NULL;
+    char *flaws_str = NULL;
     char *flaws_str_A = NULL;
     char *flaws_str_B = NULL;
@@ -1936 +1938 @@
     assert(raidlist != NULL);
 
-    mr_asprintf(flaws_str_A, "%s", "         ");
-    mr_asprintf(flaws_str_B, "%s", "         ");
-    mr_asprintf(flaws_str_C, "%s", "         ");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen("Arbitrary limits suck, man!");
@@ -1954 +1953 @@
     mr_asprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format", "Size (MB)");
     headerMsg = newtLabel(2, 1, tmp);
-    flawsLabelA = newtLabel(2, 13, flaws_str_A);
-    flawsLabelB = newtLabel(2, 14, flaws_str_B);
-    flawsLabelC = newtLabel(2, 15, flaws_str_C);
+    flawsLabelA = newtLabel(2, 13, "         ");
+    flawsLabelB = newtLabel(2, 14, "         ");
+    flawsLabelC = newtLabel(2, 15, "         ");
     partitionsListbox =
         newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -1966 +1965 @@
                           bEdit, bDelete, bReload, bCancel, bOK, NULL);
     while (!finished) {
-        evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
-                           flaws_str_C);
+        flaws_str = evaluate_mountlist(mountlist, &res);
+        spread_flaws_across_three_lines(flaws_str, flaws_str_A, flaws_str_B, flaws_str_C);
+
+        mr_free(flaws_str);
+
         newtLabelSetText(flawsLabelA, flaws_str_A);
         newtLabelSetText(flawsLabelB, flaws_str_B);
         newtLabelSetText(flawsLabelC, flaws_str_C);
         b_res = newtRunForm(myForm);
+        mr_free(flaws_str_A);
+        mr_free(flaws_str_B);
+        mr_free(flaws_str_C);
+
         if (b_res == bOK) {
-            if (!evaluate_mountlist
-                (mountlist, flaws_str_A, flaws_str_B, flaws_str_C)) {
+            flaws_str = evaluate_mountlist(mountlist, &res);
+            mr_free(flaws_str);
+            if (!res) {
                 finished =
                     ask_me_yes_or_no