[asterisk-commits] kharwell: branch 12 r405746 - in /branches/12: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: kharwell
Date: Thu Jan 16 13:52:57 2014
New Revision: 405746

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405746
Log:
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

Modified:
    branches/12/   (props changed)
    branches/12/main/manager.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/manager.c?view=diff&rev=405746&r1=405745&r2=405746
==============================================================================
--- branches/12/main/manager.c (original)
+++ branches/12/main/manager.c Thu Jan 16 13:52:57 2014
@@ -4695,6 +4695,7 @@
 
 	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));