From: David Vossel <dvossel@digium.com>
Date: Tue, 17 Aug 2010 19:34:52 +0000 (+0000)
Subject: Merged revisions 282543 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2452
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5729763b8934dbe19ee21287f5b92b4e10a2e304;p=thirdparty%2Fasterisk.git

Merged revisions 282543 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r282543 | dvossel | 2010-08-17 14:34:06 -0500 (Tue, 17 Aug 2010) | 4 lines

  fixes truncated uint64_t value in put_unaligned_uint64_t() function

  (issue #17804)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/unaligned.h b/include/asterisk/unaligned.h
index 63f430f896..9e6e743da5 100644
--- a/include/asterisk/unaligned.h
+++ b/include/asterisk/unaligned.h
@@ -50,7 +50,7 @@ static inline unsigned short get_unaligned_uint16(const void *p)
 
 static inline void put_unaligned_uint64(void *p, uint64_t datum)
 {
-	struct { unsigned int d; } __attribute__((packed,may_alias)) *pp = p;
+	struct { uint64_t d; } __attribute__((packed,may_alias)) *pp = p;
 
 	pp->d = datum;
 }