From 259f207f33b8b59e64548328f38e630ccb64bb61 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 18 Jul 2006 00:02:33 +0000 Subject: automerge commit git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37851 f38db490-d61c-443f-a65b-d21fe96a405b --- frame.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'frame.c') diff --git a/frame.c b/frame.c index d2fc71cb1..2a7ee8610 100644 --- a/frame.c +++ b/frame.c @@ -374,7 +374,7 @@ struct ast_frame *ast_frdup(struct ast_frame *f) srclen = strlen(f->src); if (srclen > 0) len += srclen + 1; - buf = malloc(len); + buf = calloc(1, len); if (!buf) return NULL; out = buf; @@ -387,16 +387,15 @@ struct ast_frame *ast_frdup(struct ast_frame *f) out->delivery = f->delivery; out->mallocd = AST_MALLOCD_HDR; out->offset = AST_FRIENDLY_OFFSET; - out->data = buf + sizeof(struct ast_frame) + AST_FRIENDLY_OFFSET; + if (out->datalen) { + out->data = buf + sizeof(struct ast_frame) + AST_FRIENDLY_OFFSET; + memcpy(out->data, f->data, out->datalen); + } if (srclen > 0) { out->src = out->data + f->datalen; /* Must have space since we allocated for it */ strcpy((char *)out->src, f->src); - } else - out->src = NULL; - out->prev = NULL; - out->next = NULL; - memcpy(out->data, f->data, out->datalen); + } return out; } -- cgit v1.2.3