Changeset 689 in MondoRescue for trunk/mondo/mondo/common/libmondo-devices.c

Timestamp:

Jul 17, 2006, 7:43:58 PM (18 years ago)

Author:

bcornec

Message:

Still other memory management improvements ( I hope :-)

File:

• trunk/mondo/mondo/common/libmondo-devices.c (modified) (5 diffs)

trunk/mondo/mondo/common/libmondo-devices.c

@@ -495 +495 @@
 char *find_cdrw_device(void)
 {
-    /*@ buffers ************************ */
-    char *comment;
-    char *tmp;
-    char *cdr_exe;
-    char *command;
-    char *cdrw_device;
+    char *comment = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *cdr_exe = NULL;
+    char *command = NULL;
+    char *cdrw_device = NULL;
 
     if (g_cdrw_drive_is_here != NULL) {
@@ -513 +513 @@
     }
     run_program_and_log_output("insmod ide-scsi", -1);
-    if (find_home_of_exe("cdrecord")) {
+    tmp = find_home_of_exe("cdrecord");
+    if (tmp) {
         asprintf(&cdr_exe, "cdrecord");
     } else {
         asprintf(&cdr_exe, "dvdrecord");
     }
-    if (find_home_of_exe(cdr_exe)) {
+    paranoid_free(tmp);
+
+    tmp1 = find_home_of_exe(cdr_exe);
+    if (tmp1) {
         asprintf(&command,
                 "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1",
@@ -527 +531 @@
         asprintf(&tmp, " ");
     }
+    paranoid_free(tmp1);
     paranoid_free(cdr_exe);
 
@@ -594 +599 @@
     }
 
-    if (find_home_of_exe("cdrecord")) {
+    tmp = find_home_of_exe("cdrecord");
+    if (tmp) {
         asprintf(&cdr_exe, "cdrecord");
     } else {
         asprintf(&cdr_exe, "dvdrecord");
     }
-    if (!find_home_of_exe(cdr_exe)) {
+    paranoid_free(tmp);
+
+    tmp = find_home_of_exe(cdr_exe);
+    if (!tmp) {
         asprintf(&output, "/dev/cdrom");
         log_msg(4, "Can't find cdrecord; assuming %s", output);
@@ -612 +621 @@
         }
     }
+    paranoid_free(tmp);
 
     asprintf(&command, "%s -scanbus 2> /dev/null", cdr_exe);