Merged revisions 164519 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r164519 | russell | 2008-12-15 15:53:30 -0600 (Mon, 15 Dec 2008) | 7 lines

Make sure we handle a uint32_t payload in ast_frdup()

(closes issue #14080)
Reported by: fnordian
Patches:
      frame.patch uploaded by fnordian (license 110)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@164521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Russell Bryant 17 years ago
parent 71d1c23319
commit f8dc9e9776

@ -476,6 +476,8 @@ struct ast_frame *ast_frdup(const struct ast_frame *f)
if (out->datalen) {
out->data.ptr = buf + sizeof(*out) + AST_FRIENDLY_OFFSET;
memcpy(out->data.ptr, f->data.ptr, out->datalen);
} else {
out->data.uint32 = f->data.uint32;
}
if (srclen > 0) {
/* This may seem a little strange, but it's to avoid a gcc (4.2.4) compiler warning */

Loading…
Cancel
Save