kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle out-of-memory conditions in ast_frisolate() properly (reported by Slav Kenov on asterisk-dev)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-06-08 16:59:44 +00:00
parent a10dff6a11
commit 4702320f54
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frame.c
View File

@@ -328,14 +328,22 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr)
out = fr; out = fr;
if (!(fr->mallocd & AST_MALLOCD_SRC)) { if (!(fr->mallocd & AST_MALLOCD_SRC)) {
if (fr->src) if (fr->src) {
out->src = strdup(fr->src); if (!(out->src = ast_strdup(fr->src))) {
if (out != fr)
free(out);
return NULL;
}
}
} else } else
out->src = fr->src; out->src = fr->src;
if (!(fr->mallocd & AST_MALLOCD_DATA)) { if (!(fr->mallocd & AST_MALLOCD_DATA)) {
if (!(newdata = ast_malloc(fr->datalen + AST_FRIENDLY_OFFSET))) { 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; return NULL;
} }
newdata += AST_FRIENDLY_OFFSET; newdata += AST_FRIENDLY_OFFSET;