Changeset 121 in MondoRescue for trunk/mondo

Timestamp:

Nov 10, 2005, 3:24:47 AM (18 years ago)

Author:

bcornec

Message:

small memory bugs fixed in newt-specific.c and libmondo-string.c

Location:

trunk/mondo/mondo/common

Files:

• libmondo-string.c (modified) (2 diffs)
• newt-specific.c (modified) (3 diffs)

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

@@ -32 +32 @@
  * @param partno The partition number (e.g. 1)
  * @param partition Where to put the partition name (e.g. /dev/hda1)
- * @return @p partition.
+ * @return @p partition. The caller has to free it.
  * @note If @p drive ends in a digit, then 'p' (on Linux) or 's' (on *BSD) is added before @p partno.
  */
@@ -257 +257 @@
     assert(width > 2);
 
-    asprintf(output, "%s", incoming);
+    asprintf(&output, "%s", incoming);
     for (i = (int) strlen(output); i < width; i++) {
         output[i] = ' ';

trunk/mondo/mondo/common/newt-specific.c

@@ -1379 +1379 @@
         for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
              filelist->entries++) {
-          god_i_hate_gotos:
             if (feof(fin)) {
                 break;
@@ -1386 +1385 @@
             i = (int) strlen(tmp);
             if (i < 2) {
-                goto god_i_hate_gotos;
+                if (feof(fin)) {
+                    break;
+                }
             }
             if (tmp[i - 1] < 32) {
@@ -1392 +1393 @@
             }
             if (i < 2) {
-                goto god_i_hate_gotos;
+                if (feof(fin)) {
+                    break;
+                }
             }
             if (!does_file_exist(tmp)) {
-                goto god_i_hate_gotos;
+                if (feof(fin)) {
+                    break;
+                }
             }
             filelist->el[filelist->entries].severity =