Changeset 146 in MondoRescue for trunk/mondo/mondo/common/libmondo-stream.c

Timestamp:

Dec 1, 2005, 10:00:14 AM (18 years ago)

Author:

bcornec

Message:

MONDO_LOGFILE used each time now
memory management on libmondo-devices.c
some splint improvements

File:

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

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

@@ -209 +209 @@
  * this platform, then the IDE tape, then "/dev/st0", then "/dev/osst0".
  * @param dev Where to put the found tape device.
- * @param siz Where to put the tape size (a string like "4GB")
+ * @param siz Where to put the tape size (a string like "4GB"). Should be freed by caller
  * @return 0 if success, nonzero if failure (in which @p dev and @p siz are undefined).
  */
@@ -220 +220 @@
 
     log_to_screen("I am looking for your tape streamer. Please wait.");
-    dev[0] = siz[0] = '\0';
+    dev[0] = '\0';
+    siz = NULL;
     if (find_home_of_exe("cdrecord")) {
         asprintf(&cdr_exe, "cdrecord");
@@ -235 +236 @@
             ("Either too few or too many tape streamers for me to detect...");
         strcpy(dev, VANILLA_SCSI_TAPE);
+        paranoid_free(tmp);
+        paranoid_free(cdr_exe);
         return 1;
     }
@@ -246 +249 @@
     if (strlen(tmp) < 2) {
         log_it("Could not find tape device");
+        paranoid_free(tmp);
+        paranoid_free(cdr_exe);
         return 1;
     }
@@ -303 +308 @@
     }
 
-    siz[0] = '\0';
     log_it("res=%d; dev=%s", res, dev);
 
     if (res) {
+        paranoid_free(tmp);
         return (res);
     }
 
     if (strlen(tmp) < 2) {
-        siz[0] = '\0';
         log_it("Warning - size of tape unknown");
+        paranoid_free(tmp);
         return (0);
     } else {
-        strcpy(siz, tmp);
+        siz = tmp;
         return (0);
     }
-    paranoid_free(tmp);
 }