diff options
| author | Kevin Harwell <kharwell@digium.com> | 2014-01-16 19:54:04 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2014-01-16 19:54:04 +0000 |
| commit | 7054e12ef2666a22752758cbc73f21f877f66ab0 (patch) | |
| tree | 996cccf40bfa2f25eab6fc17aada285145d3b1f9 /main/manager.c | |
| parent | fc241d6f52f82f65a9ba99c1fae00be89834fa02 (diff) | |
manager: Originate doesn't abort on failed format_cap allocation
action_originate responds to the remote system with an error when cap==NULL,
but doesn't return (abort the originate). Patched to return.
(closes issue ASTERISK-23034)
Reported by: Corey Farrell
Patches:
ASTERISK-23034.patch uploaded by coreyfarrell (license 5909)
........
Merged revisions 405745 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 405746 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/manager.c b/main/manager.c index 0b6cffee5..ee75967cb 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4695,6 +4695,7 @@ static int action_originate(struct mansession *s, const struct message *m) if (!cap) { astman_send_error(s, m, "Internal Error. Memory allocation failure."); + return 0; } ast_format_cap_add(cap, ast_format_set(&tmp_fmt, AST_FORMAT_SLINEAR, 0)); |