sync patches from www/firefox


(tnn)

$NetBSD: patch-na,v 1.1 2009/09/09 17:01:07 tnn Exp $

# reported upstream as:
#   https://bugzilla.mozilla.org/show_bug.cgi?id=512802

--- js/src/jsscript.cpp.orig	2009-08-24 01:32:14.000000000 +0200
+++ js/src/jsscript.cpp	2009-08-24 01:36:20.000000000 +0200
@@ -1370,19 +1370,49 @@ js_NewScript(JSContext *cx, uint32 lengt
     size_t size, vectorSize;
     JSScript *script;
     uint8 *cursor;
+#ifdef _LP64
+#define LP64_ALIGN(V)  if ((V) & 7) (V) = (((V)|7) + 1)
+#define LP64_ALIGNP(P)  if ((uintptr_t)(P) & 7) (P) = (uint8*)(((uintptr_t)(P)|7) + 1)
+#else
+#define LP64_ALIGN(V)
+#define LP64_ALIGNP(V)
+#endif
 
-    size = sizeof(JSScript) +
-           sizeof(JSAtom *) * natoms +
-           length * sizeof(jsbytecode) +
-           nsrcnotes * sizeof(jssrcnote);
-    if (nobjects != 0)
-        size += sizeof(JSObjectArray) + nobjects * sizeof(JSObject *);
-    if (nupvars != 0)
-        size += sizeof(JSUpvarArray) + nupvars * sizeof(uint32);
-    if (nregexps != 0)
-        size += sizeof(JSObjectArray) + nregexps * sizeof(JSObject *);
-    if (ntrynotes != 0)
-        size += sizeof(JSTryNoteArray) + ntrynotes * sizeof(JSTryNote);
+    size = sizeof(JSScript);
+    if (nobjects != 0) {
+	LP64_ALIGN(size);
+        size += sizeof(JSObjectArray);
+    }
+    if (nupvars != 0) {
+	LP64_ALIGN(size);
+        size += sizeof(JSUpvarArray);
+    }
+    if (nregexps != 0) {
+	LP64_ALIGN(size);
+        size += sizeof(JSObjectArray);
+    }
+    if (ntrynotes != 0) {
+	LP64_ALIGN(size);
+        size += sizeof(JSTryNoteArray);
+    }
+    if (natoms != 0) {
+	LP64_ALIGN(size);
+	size += sizeof(JSAtom *) * natoms;
+    }
+    if (nobjects != 0) {
+	LP64_ALIGN(size);
+        size += nobjects * sizeof(JSObject *);
+    }
+    if (nupvars != 0) {
+        size += nupvars * sizeof(uint32);
+    }
+    if (nregexps != 0) {
+	LP64_ALIGN(size);
+        size += nregexps * sizeof(JSObject *);
+    }
+    size += length * sizeof(jsbytecode) +
+	nsrcnotes * sizeof(jssrcnote) +
+	ntrynotes * sizeof(JSTryNote);
 
     script = (JSScript *) JS_malloc(cx, size);
     if (!script)
@@ -1393,23 +1423,28 @@ js_NewScript(JSContext *cx, uint32 lengt
 
     cursor = (uint8 *)script + sizeof(JSScript);
     if (nobjects != 0) {
+	LP64_ALIGNP(cursor);
         script->objectsOffset = (uint8)(cursor - (uint8 *)script);
         cursor += sizeof(JSObjectArray);
     }
     if (nupvars != 0) {
+	LP64_ALIGNP(cursor);
         script->upvarsOffset = (uint8)(cursor - (uint8 *)script);
         cursor += sizeof(JSUpvarArray);
     }
     if (nregexps != 0) {
+	LP64_ALIGNP(cursor);
         script->regexpsOffset = (uint8)(cursor - (uint8 *)script);
         cursor += sizeof(JSObjectArray);
     }
     if (ntrynotes != 0) {
+	LP64_ALIGNP(cursor);
         script->trynotesOffset = (uint8)(cursor - (uint8 *)script);
         cursor += sizeof(JSTryNoteArray);
     }
 
     if (natoms != 0) {
+	LP64_ALIGNP(cursor);
         script->atomMap.length = natoms;
         script->atomMap.vector = (JSAtom **)cursor;
         vectorSize = natoms * sizeof(script->atomMap.vector[0]);
@@ -1423,6 +1458,7 @@ js_NewScript(JSContext *cx, uint32 lengt
     }
 
     if (nobjects != 0) {
+	LP64_ALIGNP(cursor);
         JS_SCRIPT_OBJECTS(script)->length = nobjects;
         JS_SCRIPT_OBJECTS(script)->vector = (JSObject **)cursor;
         vectorSize = nobjects * sizeof(JS_SCRIPT_OBJECTS(script)->vector[0]);
@@ -1431,6 +1467,7 @@ js_NewScript(JSContext *cx, uint32 lengt
     }
 
     if (nupvars != 0) {
+	LP64_ALIGNP(cursor);
         JS_SCRIPT_UPVARS(script)->length = nupvars;
         JS_SCRIPT_UPVARS(script)->vector = (uint32 *)cursor;
         vectorSize = nupvars * sizeof(JS_SCRIPT_UPVARS(script)->vector[0]);
@@ -1439,6 +1476,7 @@ js_NewScript(JSContext *cx, uint32 lengt
     }
 
     if (nregexps != 0) {
+	LP64_ALIGNP(cursor);
         JS_SCRIPT_REGEXPS(script)->length = nregexps;
         JS_SCRIPT_REGEXPS(script)->vector = (JSObject **)cursor;
         vectorSize = nregexps * sizeof(JS_SCRIPT_REGEXPS(script)->vector[0]);

$NetBSD: patch-nb,v 1.1 2009/09/09 17:01:07 tnn Exp $

# reported upstream as:
#    https://bugzilla.mozilla.org/show_bug.cgi?id=512792

--- media/liboggz/src/liboggz/oggz_byteorder.h.orig	2009-08-26 22:28:18.000000000 +0200
+++ media/liboggz/src/liboggz/oggz_byteorder.h	2009-08-26 22:41:39.000000000 +0200
@@ -123,4 +123,27 @@ int32_be_at (unsigned char *c)
   return (c [0] <<  24) + (c [1] <<  16) + (c [2] <<  8) + c [3] ;
 }
 
+static ogg_uint32_t
+_le_32_at (unsigned char *c)
+{
+  return (c [3] <<  24) + (c [2] <<  16) + (c [1] <<  8) + c [0] ;
+}
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+static uint64_t
+_le_64_at (unsigned char *c)
+{
+  return (uint64_t)((uint64_t)c[7] <<  56) + ((uint64_t)c[6] <<  48)
+    + ((uint64_t)c[5] <<  40) + ((uint64_t)c[4] << 32)
+    + (c [3] <<  24) + (c [2] <<  16) + (c [1] <<  8) + c [0] ;
+}
+
+static ogg_uint16_t
+_be_16_at (unsigned char *c)
+{
+  return (c [0] <<  8) + c [1] ;
+}
+
 #endif /* __OGGZ_BYTEORDER_H__ */

$NetBSD: patch-nc,v 1.1 2009/09/09 17:01:07 tnn Exp $

# reported upstream as:
#    https://bugzilla.mozilla.org/show_bug.cgi?id=512792

--- media/liboggz/src/liboggz/oggz_auto.c.orig	2009-08-26 22:20:35.000000000 +0200
+++ media/liboggz/src/liboggz/oggz_auto.c	2009-08-26 22:40:51.000000000 +0200
@@ -62,9 +62,9 @@ int oggz_set_metric_linear (OGGZ * oggz,
 			    ogg_int64_t granule_rate_numerator,
 			    ogg_int64_t granule_rate_denominator);
 
-#define INT16_BE_AT(x) _be_16((*(ogg_int32_t *)(x)))
-#define INT32_LE_AT(x) _le_32((*(ogg_int32_t *)(x)))
-#define INT64_LE_AT(x) _le_64((*(ogg_int64_t *)(x)))
+#define INT16_BE_AT(x) _be_16_at(x)
+#define INT32_LE_AT(x) _le_32_at(x)
+#define INT64_LE_AT(x) _le_64_at(x)
 
 static int
 oggz_stream_set_numheaders (OGGZ * oggz, long serialno, int numheaders)

$NetBSD: patch-nd,v 1.1 2009/09/09 17:01:07 tnn 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);
 	}
 }