[asterisk-commits] kharwell: trunk r405747 - in /trunk: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: kharwell
Date: Thu Jan 16 13:54:04 2014
New Revision: 405747

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

Merged revisions 405746 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

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

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=405747&r1=405746&r2=405747
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Thu Jan 16 13:54:04 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));