Lawrence Livermore National Labs recently ran the source code
analysis tool Coverity over the e2fsprogs-1.39 source to see
if it would identify any significant bugs. The analysis
turned up 38 mostly minor issues which are enumerated here
with patches. We went through and resolved these issues
but would love to see these mostly minor changes reviewed
and commited upstream.
Thanks,
Brian Behlendorf <[email protected]>, and
Herb Wartens <[email protected]>
-----------------------------------------------------------------------------
Coverity ID: 15: Resource Leak
The temporary working buffer must be freed in all cases. The
easiest way to handle this was a fallout label which cleans
things up properly in the case of success or failure.
Index: e2fsprogs+chaos/lib/e2p/feature.c
===================================================================
--- e2fsprogs+chaos.orig/lib/e2p/feature.c
+++ e2fsprogs+chaos/lib/e2p/feature.c
@@ -155,6 +155,7 @@ int e2p_edit_feature(const char *str, __
int neg;
unsigned int mask;
int compat_type;
+ int rc = 0;
buf = malloc(strlen(str)+1);
if (!buf)
@@ -164,7 +165,7 @@ int e2p_edit_feature(const char *str, __
neg = 0;
cp = skip_over_blanks(cp);
next = skip_over_word(cp);
-
+
if (*next == 0)
next = 0;
else
@@ -186,15 +187,21 @@ int e2p_edit_feature(const char *str, __
cp++;
break;
}
- if (e2p_string2feature(cp, &compat_type, &mask))
- return 1;
- if (ok_array && !(ok_array[compat_type] & mask))
- return 1;
+ if (e2p_string2feature(cp, &compat_type, &mask)) {
+ rc = 1;
+ goto out;
+ }
+ if (ok_array && !(ok_array[compat_type] & mask)) {
+ rc = 1;
+ goto out;
+ }
if (neg)
compat_array[compat_type] &= ~mask;
else
compat_array[compat_type] |= mask;
}
- return 0;
+out:
+ free(buf);
+ return rc;
}