[svn-commits] kharwell: branch 11 r405745 - /branches/11/main/manager.c

[SVN commits to the Digium repositories]

Author: kharwell
Date: Thu Jan 16 13:51:17 2014
New Revision: 405745

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

Modified:
    branches/11/main/manager.c

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