Changeset 2700 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-fork.c

Timestamp:

Jan 27, 2011, 7:31:06 PM (13 years ago)

Author:

Bruno Cornec

Message:

r4176@localhost: bruno | 2011-01-26 18:11:02 +0100

• Fix buffer overflow with long exclude lines where log between mindi and mondo were exceeding fixed string size used

File:

• branches/2.2.9/mondo/src/common/libmondo-fork.c (modified) (4 diffs)

branches/2.2.9/mondo/src/common/libmondo-fork.c

@@ -379 +379 @@
 
     /*@ buffers **************************************************** */
-    char tmp[MAX_STR_LEN * 2];
-    char command[MAX_STR_LEN * 2];
+    char *tmp = NULL;
+    char *command = NULL;
     char lockfile[MAX_STR_LEN];
 
@@ -389 +389 @@
     sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
 
-    sprintf(command,
+    mr_asprintf(&command,
             "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
             lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
-    sprintf(tmp, "Executing %s", basic_call);
+    mr_asprintf(&tmp, "Executing %s", basic_call);
     log_msg(2, tmp);
+    mr_free(tmp);
+
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        sprintf(tmp, "Failed utterly to call '%s'", command);
+        mr_asprintf(&tmp, "Failed utterly to call '%s'", command);
         log_to_screen(tmp);
+        mr_free(tmp);
+        mr_free(command);
         return (1);
     }
@@ -407 +411 @@
         }
     }
+    mr_free(command);
 #ifdef _XWIN
     /* This only can update when newline goes into the file,
@@ -412 +417 @@
     while (does_file_exist(lockfile)) {
         while (!feof(fin)) {
+            /* TODO: Dead and wrong code */
             if (!fgets(tmp, 512, fin))
                 break;