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

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-07-18 00:02:33 +00:00
parent 7d70ecfe81
commit 861ecb091a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frame.c
View File

@@ -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;
}