From: Kevin Harwell <kharwell@digium.com>
Date: Thu, 16 Jan 2014 19:51:17 +0000 (+0000)
Subject: manager: Originate doesn't abort on failed format_cap allocation
X-Git-Tag: 11.9.0-rc1~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a7984281d1394bad43e3810ff0a4050b019e67c;p=thirdparty%2Fasterisk.git

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)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@405745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index 3de1cc7d5f..890aeee7f0 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -4372,6 +4372,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));