Changeset 2398 in MondoRescue for branches/2.2.9/mondo/src

Timestamp:

Sep 15, 2009, 4:00:13 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug where flaws_str could be NULL and wasn't tested correctly.

File:

• branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

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

@@ -1975 +1975 @@
     while (!finished) {
         flaws_str = evaluate_mountlist(mountlist);
-        if (strlen(flaws_str) > 0) {
+        /* flaws_str can be NULL */
+        if ((flaws_str == NULL) || (strlen(flaws_str) == 0)) {
+            mr_asprintf(&flaws_str_A, "");
+        } else {
             mr_asprintf(&flaws_str_A, "%s", flaws_str + 1);
-        } else {
-            mr_asprintf(&flaws_str_A, "");
         }
         if (strlen(flaws_str_A) >= 74) {
@@ -1994 +1995 @@
             mr_asprintf(&flaws_str_C, "");
         }
-        mr_free(flaws_str);
 
         newtLabelSetText(flawsLabelA, flaws_str_A);
@@ -2005 +2005 @@
 
         if (b_res == bOK) {
-            flaws_str = evaluate_mountlist(mountlist);
             if (flaws_str != NULL) {
-                mr_free(flaws_str);
                 finished =
                     ask_me_yes_or_no
@@ -2060 +2058 @@
             }
         }
+        mr_free(flaws_str);
     }
     newtFormDestroy(myForm);