From 94f19c82184bf508adc3f5e2398d0a776491b53c Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 12 Nov 2013 19:38:03 +0000
Subject: [PATCH] Switch to a scoped lock to avoid missing unlocks in failure
returns. ........
Merged revisions 402769 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/channel.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/main/channel.c b/main/channel.c
index 0b87b8039c..58b50c820b 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -7595,8 +7595,7 @@ struct varshead *ast_channel_get_manager_vars(struct ast_channel *chan)
RAII_VAR(struct varshead *, ret, NULL, ao2_cleanup);
RAII_VAR(struct ast_str *, tmp, NULL, ast_free);
struct manager_channel_variable *mcv;
-
- AST_RWLIST_RDLOCK(&channelvars);
+ SCOPED_LOCK(lock, &channelvars, AST_RWLIST_RDLOCK, AST_RWLIST_UNLOCK);
if (AST_LIST_EMPTY(&channelvars)) {
return NULL;
@@ -7626,13 +7625,11 @@ struct varshead *ast_channel_get_manager_vars(struct ast_channel *chan)
var = ast_var_assign(mcv->name, val ? val : "");
if (!var) {
- AST_RWLIST_UNLOCK(&channelvars);
return NULL;
}
AST_RWLIST_INSERT_TAIL(ret, var, entries);
}
- AST_RWLIST_UNLOCK(&channelvars);
ao2_ref(ret, +1);
return ret;
--
GitLab