Changeset 2241 in MondoRescue for branches/2.2.9/mondo/src/common/newt-specific.c

Timestamp:

Jun 29, 2009, 7:19:14 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3144@localhost: bruno | 2009-06-26 12:18:08 +0200

• Remove mr_string.c|.h useless and in de=uplication with mr_str.c|.h
• Solve with valgrind's help some memroy leak (harmless mostly)
• Solve a seg fault at end, when unallocating a bkpinfo member after the strcuture disallocation !
• after mr_strtok, memory ssociated with the token needs to be free
• Adds a new function free_newt_stuff to free newt related allocated memory
• Do not exit if mr_free is unsuccessful, and only warn when debug > 8

File:

• branches/2.2.9/mondo/src/common/newt-specific.c (modified) (2 diffs)

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -368 +368 @@
     }
 
+/* Free memory allocated for newt */
+void free_newt_stuff() {
+
+int i;
+
+for (i = 0; i < g_noof_log_lines; i++) {
+    mr_free(err_log_lines[i]);
+}
+mr_free(err_log_lines);
+}
+
 
 
@@ -405 +416 @@
         printf("Execution run ended; result=%d\n", signal);
         printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
-        if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
-            mr_asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
-            system(command);
-            paranoid_free(command);
-        }
+        if (bkpinfo->tmpdir) {
+            log_msg(8,"tempdir is %s",bkpinfo->tmpdir);
+            if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
+                log_msg(8,"erasing tempdir");
+                mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
+                system(command);
+                paranoid_free(command);
+            }
+        }
+        if (bkpinfo->scratchdir) {
+            log_msg(8,"scratchdir is %s", bkpinfo->scratchdir);
+            if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
+                log_msg(8,"erasing scratchdir");
+                mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
+                system(command);
+                paranoid_free(command);
+            }
+        }
+        /* Free all allocated strings in bkpinfo */
+        mr_free(bkpinfo->nfs_user);
+
+        /* Then free the structure */
         paranoid_free(bkpinfo);
         free_libmondo_global_strings();
+        free_newt_stuff();
         exit(signal);
     }