manager: Originate doesn't abort on failed format_cap allocation
authorKevin Harwell <kharwell@digium.com>
Thu, 16 Jan 2014 19:54:04 +0000 (19:54 +0000)
committerKevin Harwell <kharwell@digium.com>
Thu, 16 Jan 2014 19:54:04 +0000 (19:54 +0000)
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

main/manager.c

index 0b6cffe..ee75967 100644 (file)
@@ -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));