From ad1f0a323971311a11caf59e3c70d0ae35308647 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 18 Aug 2006 01:37:21 +0000 Subject: [PATCH] Fix null pointer reference (coverity scan) and freed pointer reference --- servers/slapd/overlays/constraint.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c index 447a48b6f4..7f33dd1cb3 100644 --- a/servers/slapd/overlays/constraint.c +++ b/servers/slapd/overlays/constraint.c @@ -137,32 +137,24 @@ constraint_cf_gen( ConfigArgs *c ) on->on_bi.bi_private = NULL; } else { - constraint *cpp; + constraint **cpp; /* zap constraint numbered 'valx' */ - for(i=0, cp = cn, cpp = NULL; + for(i=0, cp = cn, cpp = &cn; (cp) && (ivalx); - i++, cpp = cp, cp=cp->ap_next); + i++, cpp = &cp->ap_next, cp = *cpp); - if (cpp) { + if (cp) { /* zap cp, and join cpp to cp->ap_next */ - cpp->ap_next = cp->ap_next; + *cpp = cp->ap_next; if (cp->re) { regfree(cp->re); ch_free(cp->re); } if (cp->re_str) ch_free(cp->re_str); ch_free(cp); - } else { - /* zap the list head */ - if (cn->re) { - regfree(cn->re); - ch_free(cn->re); - } - if (cn->re_str) ch_free(cn->re_str); - ch_free(cn); - on->on_bi.bi_private = cn->ap_next; } + on->on_bi.bi_private = cn; } break; -- 2.39.5