Changeset 2241 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-archive.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/libmondo-archive.c (modified) (8 diffs)

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

@@ -541 +541 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(last_filelist_number);
-
     mr_asprintf(&tmp,
             "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
@@ -2035 +2033 @@
     char *tmp = NULL;
     char *bigfile_fname;
-    char *sz_devfile;
+    char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
     /*@ long *********************************************** */
@@ -2055 +2053 @@
 
     malloc_string(bigfile_fname);
-    malloc_string(sz_devfile);
     estimated_total_noof_slices =
         size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1;
@@ -2111 +2108 @@
                         "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_fname);
-                sprintf(sz_devfile, "%s/%d.%d.000",
+                mr_asprintf(&sz_devfile, "%s/%d.%d.000",
                         bkpinfo->tmpdir,
                         (int) (random() % 32768),
@@ -2119 +2116 @@
                 switch (pid = fork()) {
                 case -1:
+                    mr_free(sz_devfile);
                     fatal_error("Fork failure");
                 case 0:
@@ -2125 +2123 @@
                             bigfile_fname, sz_devfile);
                     res = feed_into_ntfsprog(bigfile_fname, sz_devfile);
+                    /* BCO/BERLIOS Does the child need to unalocate memory as well ?
+                    paranoid_free(bigfile_fname);
+                    mr_free(sz_devfile);
+                    */
                     exit(res);
                     break;
@@ -2131 +2133 @@
                             "feed_into_ntfsprog() called in background --- pid=%ld",
                             (long int) (pid));
+                    mr_free(sz_devfile);
                 }
             }
             // Otherwise, use good old 'dd' and 'bzip2'
             else {
-                sz_devfile[0] = '\0';
                 ntfsprog_fifo = NULL;
             }
@@ -2188 +2190 @@
     paranoid_fclose(fin);
     paranoid_free(bigfile_fname);
-    paranoid_free(sz_devfile);
     return (retval);
 }