summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2012-08-01 19:37:03 +0000
committerMark Michelson <mmichelson@digium.com>2012-08-01 19:37:03 +0000
commit38f0ca423e5a9518412e2199725aaa360ebe81e3 (patch)
tree27cadbc938b5858fa4561391511b51677cf61bc8 /main
parentea0732def2b959eae27a06ba6c14f07946588295 (diff)
Fix a possible crash due to passing NULL to ast_variables_dup()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/manager.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c
index f7fa7b53d..97e92fc70 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2556,7 +2556,9 @@ static int authenticate(struct mansession *s, const struct message *m)
s->session->readperm = user->readperm;
s->session->writeperm = user->writeperm;
s->session->writetimeout = user->writetimeout;
- s->session->chanvars = ast_variables_dup(user->chanvars);
+ if (user->chanvars) {
+ s->session->chanvars = ast_variables_dup(user->chanvars);
+ }
filter_iter = ao2_iterator_init(user->whitefilters, 0);
while ((regex_filter = ao2_iterator_next(&filter_iter))) {