From 9036d30ed87462c81c4fe69dae32ded8acf9e953 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 6 Dec 2016 07:16:43 -0500 Subject: [PATCH] fix call struct being accessed after obj_put Change-Id: I33dea4d637c531bdf33c54485da5627b5eeb5a32 --- daemon/redis.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/redis.c b/daemon/redis.c index ed019286e..49fb976fc 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -1471,7 +1471,6 @@ static void redis_restore_call(struct redis *r, struct callmaster *m, const redi redis_restore_recording(c, &call); err = NULL; - obj_put(c); err8: redis_destroy_list(&maps); @@ -1491,13 +1490,14 @@ err1: log_info_clear(); if (err) { rlog(LOG_WARNING, "Failed to restore call ID '%.*s' from Redis: %s", REDIS_FMT(id), err); - if (c) { + if (c) call_destroy(c); - obj_put(c); - } else redisCommandNR(m->conf.redis_write->ctx, "SREM calls "PB"", STR_R(id)); } + + if (c) + obj_put(c); }