diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-23 21:45:29 +0900 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-01-13 11:06:32 +0100 |
commit | ee94faa7da938957ce77c558693f4d43a16e7896 (patch) | |
tree | 6072ead2ea5cb12b32a03b67e341ac0338dd1a82 | |
parent | 260e6bbdeb1d59e52ead4bc9d62209303ec44efc (diff) | |
download | systemd-ee94faa7da938957ce77c558693f4d43a16e7896.tar.gz |
sd-journal: fix segfault when match_new() fails
Fixes #21867.
(cherry picked from commit 39dfc0de05238410e2cd4d7c0176a3f3994cc563)
(cherry picked from commit 4bf497c3814e2f612cb055b838a656e6e14c0ed0)
-rw-r--r-- | src/libsystemd/sd-journal/sd-journal.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c index 60899a3942..24604d86a9 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -211,7 +211,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) @@ -221,14 +221,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) { @@ -323,9 +323,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; } |