Skip to content

Commit 1d00848

Browse files
ikegami-tigaw
authored andcommitted
ccan: Add freed pointer checking to delete strset member
Add to set freed entry pointer to NULL then check it if NULL. Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
1 parent 927aac9 commit 1d00848

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ccan/ccan/strset/strset.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ char *strset_del(struct strset *set, const char *member)
194194

195195
/* Sew empty string back so remaining logic works */
196196
free(n->u.n);
197+
n->u.n = NULL;
197198
n->u.s = empty_str;
198199
break;
199200
}
@@ -208,7 +209,7 @@ char *strset_del(struct strset *set, const char *member)
208209
}
209210

210211
/* Did we find it? */
211-
if (!streq(member, n->u.s)) {
212+
if (!n->u.s || !streq(member, n->u.s)) {
212213
errno = ENOENT;
213214
return NULL;
214215
}

0 commit comments

Comments
 (0)