Changeset 58 in MondoRescue for trunk/mondo/mondo/common/libmondo-string.c

Timestamp:

Oct 10, 2005, 11:22:08 AM (19 years ago)

Author:

bcornec

Message:

Trunk: This version executes correctly mondoarchive
with the new memory management system (r57 didn't)

File:

• trunk/mondo/mondo/common/libmondo-string.c (modified) (5 diffs)

trunk/mondo/mondo/common/libmondo-string.c

@@ -122 +122 @@
 {
     char *pos_w_commas;
-    char *output;
+    static char output[MAX_STR_LEN];
     char *tmp;
     int j;
@@ -145 +145 @@
         asprintf(&pos_w_commas, "%s", tmp);
     }
-    asprintf(&output, "%s", pos_w_commas);
+    strcpy(output, pos_w_commas);
     paranoid_free(pos_w_commas);
     paranoid_free(tmp);
@@ -250 +250 @@
     assert(width > 2);
 
-    asprintf(&output, "%s", incoming);
+    asprintf(output, "%s", incoming);
     for (i = (int) strlen(output); i < width; i++) {
         output[i] = ' ';
@@ -707 +707 @@
     /*@ buffers ***************************************************** */
     char *tmp;
+    char *tmp1;
 
     /*@ pointers **************************************************** */
@@ -738 +739 @@
                 in_out[i++] = ' ';
             } else if (in_out[i] == '\r') {
-                paranoid_free(tmp);
-                asprintf(&tmp, "%s", in_out + i);
-                strcpy(in_out, tmp);
+                asprintf(&tmp1, "%s", in_out + i);
+                strcpy(in_out, tmp1);
+                paranoid_free(tmp1);
                 i = -1;
                 continue;