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

Merge "core/frame: Fix ast_frdup() and ast_frisolate() for empty text frames"

Browse Source
This commit is contained in:
George Joseph
2018-10-03 13:55:24 -05:00
committed by Gerrit Code Review
parent bc9a7c419c 24cece660b
commit 967fffb569
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/frame.c
View File

@@ -259,7 +259,7 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr)
if (!(fr->mallocd & AST_MALLOCD_DATA)) { if (!(fr->mallocd & AST_MALLOCD_DATA)) {
/* The original frame has a non-malloced data buffer. */ /* The original frame has a non-malloced data buffer. */
if (!fr->datalen) { if (!fr->datalen && fr->frametype != AST_FRAME_TEXT) {
/* Actually it's just an int so we can simply copy it. */ /* Actually it's just an int so we can simply copy it. */
out->data.uint32 = fr->data.uint32; out->data.uint32 = fr->data.uint32;
return out; return out;
@@ -356,7 +356,8 @@ struct ast_frame *ast_frdup(const struct ast_frame *f)
*/ */
out->mallocd = AST_MALLOCD_HDR; out->mallocd = AST_MALLOCD_HDR;
out->offset = AST_FRIENDLY_OFFSET; out->offset = AST_FRIENDLY_OFFSET;
if (out->datalen) { /* Make sure that empty text frames have a valid data.ptr */
if (out->datalen || f->frametype == AST_FRAME_TEXT) {
out->data.ptr = buf + sizeof(*out) + AST_FRIENDLY_OFFSET; out->data.ptr = buf + sizeof(*out) + AST_FRIENDLY_OFFSET;
memcpy(out->data.ptr, f->data.ptr, out->datalen); memcpy(out->data.ptr, f->data.ptr, out->datalen);
} else { } else {