From ddb0bca6ad0444d98593bd37cf361c29aec5fb36 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 24 Jul 2012 16:54:01 +0000 Subject: [PATCH] Rewrite a comment that didn't adequately explain the code it was documenting. ........ Merged revisions 370429 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@370430 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/frame.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/main/frame.c b/main/frame.c index b3ee6412df..4ac29a6cfb 100644 --- a/main/frame.c +++ b/main/frame.c @@ -491,13 +491,18 @@ struct ast_frame *ast_frdup(const struct ast_frame *f) out->datalen = f->datalen; out->samples = f->samples; out->delivery = f->delivery; - /* Set us as having malloc'd header only, so it will eventually - get freed. */ + /* Even though this new frame was allocated from the heap, we can't mark it + * with AST_MALLOCD_HDR, AST_MALLOCD_DATA and AST_MALLOCD_SRC, because that + * would cause ast_frfree() to attempt to individually free each of those + * under the assumption that they were separately allocated. Since this frame + * was allocated in a single allocation, we'll only mark it as if the header + * was heap-allocated; this will result in the entire frame being properly freed. + */ out->mallocd = AST_MALLOCD_HDR; out->offset = AST_FRIENDLY_OFFSET; if (out->datalen) { 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 { out->data.uint32 = f->data.uint32; }