Changeset 2308 in MondoRescue

Timestamp:

Jul 27, 2009, 8:59:06 PM (15 years ago)

Author:

Bruno Cornec

Message:

Fix a bug in mr_strcat backported from 2.2.10. Should solve our seg faults.

File:

• branches/2.2.9/mondo/src/lib/mr_mem.c (modified) (1 diff)

branches/2.2.9/mondo/src/lib/mr_mem.c

@@ -138 +138 @@
     } else {
         mr_asprintf_int(&fmt2, line, file, "%s%s", *in, fmt);
-        res = vasprintf(&p, fmt2, args);
+        mr_free_int((void **)in,line,file);
+        res = vasprintf(in, fmt2, args);
+        if (res == -1) {
+            mr_msg_int(1,line,file,"Unable to alloc memory in mr_strcat\nExiting...");
+            mr_exit(-1,"Unable to alloc memory in mr_strcat");
+        }
         mr_free_int((void **)&fmt2,line,file);
-        mr_free_int((void **)in,line,file);
-        in = &p;
     }
     va_end(args);