diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/regc_color.c | 5 | ||||
| -rw-r--r-- | generic/regc_nfa.c | 4 |
3 files changed, 10 insertions, 4 deletions
@@ -11,6 +11,11 @@ REGEXP_MCCE_ENABLE. This silences coverity bugs 7, 16, 80 + * generic/regc_color.c (uncolorchain): + * generic/regc_nfa.c (freearc): changed tests and asserts to + equivalent formulation, designed to avoid an explicit comparison + to NULL and satisfy coverity that 6 and 9 are not bugs. + 2006-09-27 Andreas Kupries <andreask@activestate.com> * tests/pkg.test: Added test for version comparison at the 32bit diff --git a/generic/regc_color.c b/generic/regc_color.c index f1f216f..1a7eeda 100644 --- a/generic/regc_color.c +++ b/generic/regc_color.c @@ -673,10 +673,11 @@ uncolorchain( if (aa == a) { /* easy case */ cd->arcs = a->colorchain; } else { - for (; aa != NULL && aa->colorchain != a; aa = aa->colorchain) { + assert(aa != NULL); + for (; aa->colorchain != a; aa = aa->colorchain) { + assert(aa->colorchain != NULL); continue; } - assert(aa != NULL); aa->colorchain = a->colorchain; } a->colorchain = NULL; /* paranoia */ diff --git a/generic/regc_nfa.c b/generic/regc_nfa.c index 12a016e..d5e7e01 100644 --- a/generic/regc_nfa.c +++ b/generic/regc_nfa.c @@ -409,10 +409,10 @@ freearc( if (a == victim) { /* simple case: first in chain */ to->ins = victim->inchain; } else { - for (; a != NULL && a->inchain != victim; a = a->inchain) { + for (; a->inchain != victim; a = a->inchain) { + assert(a->inchain != NULL); continue; } - assert(a != NULL); a->inchain = victim->inchain; } to->nins--; |