1
0
Fork 0

Merging upstream version 2.10.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:27:38 +01:00
parent 736f2f7c80
commit 37275c4af3
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
530 changed files with 12276 additions and 4877 deletions

View file

@ -194,6 +194,7 @@ char *strset_del(struct strset *set, const char *member)
/* Sew empty string back so remaining logic works */
free(n->u.n);
n->u.n = NULL;
n->u.s = empty_str;
break;
}
@ -208,7 +209,7 @@ char *strset_del(struct strset *set, const char *member)
}
/* Did we find it? */
if (!streq(member, n->u.s)) {
if (!n->u.s || !streq(member, n->u.s)) {
errno = ENOENT;
return NULL;
}