Changeset 121 in MondoRescue

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

Files:

• mondo/mondo/common/libmondo-string.c (modified) (2 diffs)
• mondo/mondo/common/newt-specific.c (modified) (3 diffs)
• tools/quality (modified) (1 diff)

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 =

trunk/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r asprintf | wc -l` asprintf"
-echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r sprintf | grep -v asprintf | wc -l` sprintf"
-echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r strcat | wc -l` strcat"
-echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r strcpy | wc -l` strcpy"
-echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r fgets | wc -l` fgets"
-echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r malloc_string | wc -l` malloc_string"
-echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r MAX_STR_LEN | wc -l` MAX_STR_LEN"
-echo "monodrescue uses : `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r goto | wc -l` goto"
+for s in asprintf sprintf strcat strcpy fgets malloc_string MAX_STR_LEN goto; do
+    echo "monodrescue $s usage : "
+    for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn' | egrep -v '/\*' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
+            echo " === $i"
+    done
+done
 
 echo " "