mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-27 16:07:15 -07:00
handle out-of-memory conditions properly in ast_frisolate() (reported by Slav Kenov on asterisk-dev mailing list)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@33036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user