From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 18 Jul 2006 00:43:57 +0000 (+0000)
Subject: Merged revisions 37856 via svnmerge from
X-Git-Tag: 1.4.0-beta1~561
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dd7291aa0e96cad362ce604ff19d3a835f1f770;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@37857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/frame.c b/frame.c
index c2db41bad3..62d69eda1d 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);
 	}