diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-08 16:59:44 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-08 16:59:44 +0000 |
commit | d76959d3faa76bf3b9f6963317e262f32ed24308 (patch) | |
tree | a2cdc03d165e33aa2b955dde1593650841b0f19a /frame.c | |
parent | 76e25df2bcee1feb9ffbce09e0e7690633ac4866 (diff) |
handle out-of-memory conditions in ast_frisolate() properly (reported by Slav Kenov on asterisk-dev)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@33037 f38db490-d61c-443f-a65b-d21fe96a405b
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; |