Changeset 2209 in MondoRescue for branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

May 15, 2009, 4:56:31 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Use new libmr.a in build process
• Use mr_strcat to fix a memory allocation bug when mountlist contains lots of references unavailable at restore time, creating a error when memory is statically allocated (more usage is expected now).

File:

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

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

@@ -1943 +1943 @@
     /** buffers **********************************************************/
     char tmp[MAX_STR_LEN];
-    char flaws_str_A[MAX_STR_LEN];
-    char flaws_str_B[MAX_STR_LEN];
-    char flaws_str_C[MAX_STR_LEN];
+    char *flaws_str_A = NULL;
+    char *flaws_str_B = NULL;
+    char *flaws_str_C = NULL;
 
     assert(mountlist != NULL);
     assert(raidlist != NULL);
 
-    strcpy(flaws_str_A, "xxxxxxxxx");
-    strcpy(flaws_str_B, "xxxxxxxxx");
-    strcpy(flaws_str_C, "xxxxxxxxx");
+    asprintf(&flaws_str_A, "%s", "xxxxxxxxx");
+    asprintf(&flaws_str_B, "%s", "xxxxxxxxx");
+    asprintf(&flaws_str_C, "%s", "xxxxxxxxx");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen("Arbitrary limits suck, man!");
@@ -2043 +2043 @@
         }
     }
+    paranoid_free(flaws_str_A);
+    paranoid_free(flaws_str_B);
+    paranoid_free(flaws_str_C);
     newtFormDestroy(myForm);
     newtPopWindow();
@@ -2068 +2071 @@
 {
     int res = 0;
-//  char tmp[MAX_STR_LEN];
 
     iamhere("entering eml");