aboutsummaryrefslogtreecommitdiffstats
path: root/frame.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-07-18 00:43:57 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-07-18 00:43:57 +0000
commit1dc3bbe40360ddc1de994ea234a10b1dfb05c521 (patch)
tree5818f97e817f686c4d84f19a1a9005a853e70da7 /frame.c
parentcb1944f8faeb29c6e3bd7e997ab9e81b292dea9c (diff)
Merged revisions 37856 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r37856 | russell | 2006-07-17 20:41:47 -0400 (Mon, 17 Jul 2006) | 2 lines don't crash if the frame has no data, but has a src ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37857 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'frame.c')
-rw-r--r--frame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/frame.c b/frame.c
index c2db41bad..62d69eda1 100644
--- a/frame.c
+++ b/frame.c
@@ -392,7 +392,7 @@ struct ast_frame *ast_frdup(struct ast_frame *f)
memcpy(out->data, f->data, out->datalen);
}
if (srclen > 0) {
- out->src = out->data + f->datalen;
+ out->src = buf + sizeof(*out) + AST_FRIENDLY_OFFSET + f->datalen;
/* Must have space since we allocated for it */
strcpy((char *)out->src, f->src);
}