diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-06-08 16:59:44 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-06-08 16:59:44 +0000 |
commit | 4702320f5439cdcc2d59469e55ddb2aa6b47a25e (patch) | |
tree | a2cdc03d165e33aa2b955dde1593650841b0f19a /frame.c | |
parent | a10dff6a111cd1ca6ad7fdafd2e2fb4acd35cf34 (diff) |
handle out-of-memory conditions in ast_frisolate() properly (reported by Slav Kenov on asterisk-dev)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'frame.c')
-rw-r--r-- | frame.c | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -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; |