Changeset 1856 in MondoRescue for branches/2.2.5

Timestamp:

Jan 11, 2008, 1:39:17 PM (16 years ago)

Author:

Bruno Cornec

Message:

solve the seg fault in snprintf due to a change of number of params

File:

• branches/2.2.5/mondo/src/common/libmondo-filelist.c (modified) (2 diffs)

branches/2.2.5/mondo/src/common/libmondo-filelist.c

@@ -1697 +1697 @@
     struct stat statbuf;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
 
     malloc_string(command);
@@ -1752 +1753 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
-        asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|fat|vfat|dos' | awk '{print $3}'"));
-        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s %s . .. \
+        asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|fat|vfat|dos' | awk '{print $3}'"));
+        if (strlen(tmp2) < 1) {
+            asprintf(&tmp1,"");
+        } else {
+            log_msg(2, "Found windows FS: %s",tmp2);
+            asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            paranoid_free(tmp2);
+            asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp1));
+            log_msg(2, "Found windows files: %s",tmp2);
+        }
+        paranoid_free(tmp1);
+
+        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \
-/proc /sys /root/images/mondo " MINDI_CACHE, MONDO_CACHE, excp, call_program_and_get_last_line_of_output(tmp1), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
-        paranoid_free(tmp1);
+/proc /sys /root/images/mondo " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        paranoid_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);