automerge commit

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

diff --git a/frame.c b/frame.c
index a43a9834d75c9701202595f42341564d09406152..d2fc71cb188c41e8732ece8461c6487b3e050ab9 100644 (file)
--- 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;
                }