automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37875 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/frame.c b/frame.c
index 2a7ee861054c3e92c12c57ab1258ae8743dd4cd6..2b504399d0ee772762ae67aac526d2465e8c0a76 100644 (file)
--- 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);
        }