system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-06 16:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-journal: fix segfault when match_new() fails

Browse source 
Fixes #21867.
This commit is contained in:
Yu Watanabe 2021-12-23 21:45:29 +09:00
parent 418cce628c
commit 39dfc0de05
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libsystemd/sd-journal/sd-journal.c
View file

@ -212,7 +212,7 @@ static Match *match_new(Match *p, MatchType t) {
return m;
}
static void match_free(Match *m) {
static Match *match_free(Match *m) {
assert(m);
while (m->matches)
@ -222,14 +222,14 @@ static void match_free(Match *m) {
LIST_REMOVE(matches, m->parent->matches, m);
free(m->data);
free(m);
return mfree(m);
}
static void match_free_if_empty(Match *m) {
static Match *match_free_if_empty(Match *m) {
if (!m || m->matches)
return;
return m;
match_free(m);
return match_free(m);
}
_public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
@ -324,9 +324,9 @@ _public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size)
fail:
match_free(m);
match_free_if_empty(add_here);
match_free_if_empty(j->level2);
match_free_if_empty(j->level1);
match_free_if_empty(j->level0);
j->level2 = match_free_if_empty(j->level2);
j->level1 = match_free_if_empty(j->level1);
j->level0 = match_free_if_empty(j->level0);
return -ENOMEM;
}