From 7054e12ef2666a22752758cbc73f21f877f66ab0 Mon Sep 17 00:00:00 2001 From: Kevin Harwell Date: Thu, 16 Jan 2014 19:54:04 +0000 Subject: 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 --- main/manager.c | 1 + 1 file changed, 1 insertion(+) (limited to 'main/manager.c') 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)); -- cgit v1.2.3