diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/channel.c b/main/channel.c index a44279d22..0b87b8039 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7596,10 +7596,6 @@ struct varshead *ast_channel_get_manager_vars(struct ast_channel *chan) RAII_VAR(struct ast_str *, tmp, NULL, ast_free); struct manager_channel_variable *mcv; - if (!ret || !tmp) { - return NULL; - } - AST_RWLIST_RDLOCK(&channelvars); if (AST_LIST_EMPTY(&channelvars)) { @@ -7609,6 +7605,10 @@ struct varshead *ast_channel_get_manager_vars(struct ast_channel *chan) ret = ao2_alloc(sizeof(*ret), varshead_dtor); tmp = ast_str_create(16); + if (!ret || !tmp) { + return NULL; + } + AST_LIST_TRAVERSE(&channelvars, mcv, entry) { const char *val = NULL; struct ast_var_t *var; |