diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-10-10 13:40:40 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-10-10 13:40:40 +0000 |
| commit | 357b733b669ce53071557cafed14e18c586abc7b (patch) | |
| tree | 9ae9decd5b93e69f3b3e6bf1149c3ae53ac1003f /main | |
| parent | 9a0ff624528ce6c62ce7782c83928bfd35696f96 (diff) | |
Fix segfault regression from r370681
Due to usage of ast_hook_send_action, AMI action handling code should
be able to handle a NULL mansession->session. This would cause a crash
on NULL dereference if action_originate was called from
ast_hook_send_action.
(closes issue ASTERISK-20544)
........
Merged revisions 374792 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 0a6d9620e..bb9c35944 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4369,7 +4369,7 @@ static int action_originate(struct mansession *s, const struct message *m) /* Allocate requested channel variables */ vars = astman_get_variables(m); - if (s->session->chanvars) { + if (s->session && s->session->chanvars) { struct ast_variable *v, *old; old = vars; vars = NULL; |