handle out-of-memory conditions in ast_frisolate() properly (reported by Slav Kenov...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33037 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/frame.c b/frame.c
index cfa7be6..d0df4db 100644 (file)
--- a/frame.c
+++ b/frame.c
@@ -328,14 +328,22 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr)
                out = fr;
        
        if (!(fr->mallocd & AST_MALLOCD_SRC)) {
-               if (fr->src)
-                       out->src = strdup(fr->src);
+               if (fr->src) {
+                       if (!(out->src = ast_strdup(fr->src))) {
+                               if (out != fr)
+                                       free(out);
+                               return NULL;
+                       }
+               }
        } else
                out->src = fr->src;
        
        if (!(fr->mallocd & AST_MALLOCD_DATA))  {
                if (!(newdata = ast_malloc(fr->datalen + AST_FRIENDLY_OFFSET))) {
-                       free(out);
+                       if (out->src != fr->src)
+                               free((void *) out->src);
+                       if (out != fr)
+                               free(out);
                        return NULL;
                }
                newdata += AST_FRIENDLY_OFFSET;