[pkgsrc/trunk]: pkgsrc/www/firefox Fix an alignement problem in qcms/iccread.c

[martin <martin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34fe03476b1f
branches:  trunk
changeset: 398526:34fe03476b1f
user:      martin <martin%pkgsrc.org@localhost>
date:      Tue Sep 01 20:36:19 2009 +0000

description:
Fix an alignement problem in qcms/iccread.c

diffstat:

 www/firefox/distinfo         |   3 ++-
 www/firefox/patches/patch-nd |  37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletions(-)

diffs (58 lines):

diff -r 119c074b7ebe -r 34fe03476b1f www/firefox/distinfo
--- a/www/firefox/distinfo      Tue Sep 01 18:23:28 2009 +0000
+++ b/www/firefox/distinfo      Tue Sep 01 20:36:19 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2009/09/01 02:57:26 dsainty Exp $
+$NetBSD: distinfo,v 1.93 2009/09/01 20:36:19 martin Exp $
 
 SHA1 (firefox-3.5.2-source.tar.bz2) = 6439923ff9d316297926ebe193bac3ac1a41b494
 RMD160 (firefox-3.5.2-source.tar.bz2) = d5e0b5f0e8b19b216394584ccabf37d776b89a39
@@ -41,6 +41,7 @@
 SHA1 (patch-na) = 10a09ddb5de67c3cc2f605c75de7ac2e30a92ae7
 SHA1 (patch-nb) = 6b1719219df7cdd7bf5335fcf7f48567a37ffa87
 SHA1 (patch-nc) = f2a3cc803a114702e856947c25fd79baa85b0e26
+SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865
 SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
 SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
 SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
diff -r 119c074b7ebe -r 34fe03476b1f www/firefox/patches/patch-nd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-nd      Tue Sep 01 20:36:19 2009 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-nd,v 1.1 2009/09/01 20:36:19 martin Exp $
+
+# reported upstream as
+#   https://bugzilla.mozilla.org/show_bug.cgi?id=514002
+
+--- gfx/qcms/iccread.c.orig    2009-07-30 17:30:16.000000000 +0200
++++ gfx/qcms/iccread.c 2009-09-01 21:29:29.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <math.h>
+ #include <assert.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "qcmsint.h"
+ 
+ //XXX: use a better typename
+@@ -84,7 +85,9 @@ static uint32_t read_u32(struct mem_sour
+               invalid_source(mem, "Invalid offset");
+               return 0;
+       } else {
+-              return be32_to_cpu(*(__be32*)(mem->buf + offset));
++              uint32_t v;
++              memcpy(&v, mem->buf + offset, 4);
++              return be32_to_cpu(v);
+       }
+ }
+ 
+@@ -94,7 +97,9 @@ static uint16_t read_u16(struct mem_sour
+               invalid_source(mem, "Invalid offset");
+               return 0;
+       } else {
+-              return be16_to_cpu(*(__be16*)(mem->buf + offset));
++              uint16_t v;
++              memcpy(&v, mem->buf + offset, 2);
++              return be16_to_cpu(v);
+       }
+ }
+