[asterisk-commits] branch oej/managerstuff r18299 - in /team/oej/managerstuff: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Fri Apr  7 10:22:53 2006
New Revision: 18299

URL: http://svn.digium.com/view/asterisk?rev=18299&view=rev
Log:
Resolve, reset, go

Modified:
    team/oej/managerstuff/   (props changed)
    team/oej/managerstuff/channels/chan_sip.c

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr  7 10:22:53 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-18127
+/branches/1.2:1-7496,7498-18259

Modified: team/oej/managerstuff/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_sip.c?rev=18299&r1=18298&r2=18299&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_sip.c (original)
+++ team/oej/managerstuff/channels/chan_sip.c Fri Apr  7 10:22:53 2006
@@ -11668,11 +11668,17 @@
 		ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format %s while capability is %s\n", ast_getformatname(oldformat), ast_getformatname(global_capability));
 		return NULL;
 	}
-	if (!(p = sip_alloc(NULL, NULL, 0, SIP_INVITE)))
+	if (!(p = sip_alloc(NULL, NULL, 0, SIP_INVITE))) {
+		*cause = AST_CAUSE_CONGESTION;
 		return NULL;
-
-	if (!(p->options = ast_calloc(1, sizeof(*p->options))))
+	}
+
+	if (!(p->options = ast_calloc(1, sizeof(*p->options)))) {
+		sip_destroy(p);
+		ast_log(LOG_ERROR, "Unable to build option SIP data structure - Out of memory\n");
+		*cause = AST_CAUSE_CONGESTION;
 		return NULL;
+	}
 
 	ast_copy_string(tmp, dest, sizeof(tmp));
 	host = strchr(tmp, '@');