From 69f90dd5846d9ab254bd6bcd290b0a7dce5ad962 Mon Sep 17 00:00:00 2001
From: root <root@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 8 Jun 2006 17:04:02 +0000
Subject: automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33062 f38db490-d61c-443f-a65b-d21fe96a405b
---
 frame.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'frame.c')

diff --git a/frame.c b/frame.c
index a43a9834d..d2fc71cb1 100644
--- a/frame.c
+++ b/frame.c
@@ -324,15 +324,25 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr)
 		out = fr;
 	
 	if (!(fr->mallocd & AST_MALLOCD_SRC)) {
-		if (fr->src)
+		if (fr->src) {
 			out->src = strdup(fr->src);
+			if (!out->src) {
+				if (out != fr)
+					free(out);
+				ast_log(LOG_WARNING, "Out of memory\n");
+				return NULL;
+			}
+		}
 	} else
 		out->src = fr->src;
 	
 	if (!(fr->mallocd & AST_MALLOCD_DATA))  {
 		newdata = malloc(fr->datalen + AST_FRIENDLY_OFFSET);
 		if (!newdata) {
-			free(out);
+			if (out->src != fr->src)
+				free((void *) out->src);
+			if (out != fr)
+				free(out);
 			ast_log(LOG_WARNING, "Out of memory\n");
 			return NULL;
 		}
-- 
cgit v1.2.3