From 45da27fa053898c1b94c175070a0dd63128875c9 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Mon, 8 Mar 2021 10:35:31 -0800 Subject: oomd: move TAKE_PTR to end of oomd_insert_cgroup_context() Fixes #18926 --- src/oom/oomd-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/oom/oomd-util.c') diff --git a/src/oom/oomd-util.c b/src/oom/oomd-util.c index b054ccacc4..82bc9e2529 100644 --- a/src/oom/oomd-util.c +++ b/src/oom/oomd-util.c @@ -384,7 +384,7 @@ int oomd_system_context_acquire(const char *proc_swaps_path, OomdSystemContext * int oomd_insert_cgroup_context(Hashmap *old_h, Hashmap *new_h, const char *path) { _cleanup_(oomd_cgroup_context_freep) OomdCGroupContext *curr_ctx = NULL; - OomdCGroupContext *old_ctx, *ctx; + OomdCGroupContext *old_ctx; int r; assert(new_h); @@ -401,11 +401,11 @@ int oomd_insert_cgroup_context(Hashmap *old_h, Hashmap *new_h, const char *path) curr_ctx->last_hit_mem_pressure_limit = old_ctx->last_hit_mem_pressure_limit; } - ctx = TAKE_PTR(curr_ctx); - r = hashmap_put(new_h, ctx->path, ctx); + r = hashmap_put(new_h, curr_ctx->path, curr_ctx); if (r < 0) return r; + TAKE_PTR(curr_ctx); return 0; } -- cgit v1.2.1