automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@18259 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8b826f1952af8b43ba7adfe0282d9b8bb869aa38..cd85faf39c018d7a06aeb7cdeeabc07fe998e171 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11662,13 +11662,16 @@ static struct ast_channel *sip_request_call(const char *type, int format, void *
        }
        p = sip_alloc(NULL, NULL, 0, SIP_INVITE);
        if (!p) {
-               ast_log(LOG_WARNING, "Unable to build sip pvt data for '%s'\n", (char *)data);
+               ast_log(LOG_ERROR, "Unable to build sip pvt data for '%s' (Out of memory)\n", (char *)data);
+               *cause = AST_CAUSE_CONGESTION;
                return NULL;
        }
 
        p->options = calloc(1, sizeof(*p->options));
        if (!p->options) {
-               ast_log(LOG_ERROR, "Out of memory\n");
+               sip_destroy(p);
+               ast_log(LOG_ERROR, "Unable to build option SIP data structure - Out of memory\n");
+               *cause = AST_CAUSE_CONGESTION;
                return NULL;
        }