forked from pool/MozillaFirefox
a7f369b4c2
* MFSA 2012-34/CVE-2012-1938/CVE-2012-1937/CVE-2011-3101
Miscellaneous memory safety hazards
* MFSA 2012-36/CVE-2012-1944 (bmo#751422)
Content Security Policy inline-script bypass
* MFSA 2012-37/CVE-2012-1945 (bmo#670514)
Information disclosure though Windows file shares and shortcut
files
* MFSA 2012-38/CVE-2012-1946 (bmo#750109)
Use-after-free while replacing/inserting a node in a document
* MFSA 2012-40/CVE-2012-1947/CVE-2012-1940/CVE-2012-1941
Buffer overflow and use-after-free issues found using Address
Sanitizer
- require NSS 3.13.4
* MFSA 2012-39/CVE-2012-0441 (bmo#715073)
- fix sound notifications when filename/path contains a whitespace
(bmo#749739)
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=280
122 lines
4.6 KiB
Diff
122 lines
4.6 KiB
Diff
# HG changeset patch
|
|
# Parent 7bc8f0e5bed8cb2212e27228e628861737256459
|
|
Patch to make Mozilla build with gcc 4.7, including
|
|
- Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14)
|
|
- Bug 741348 - Work around crashreporter client build failure with gcc 4.7 (TM: Mozilla15)
|
|
|
|
diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp
|
|
--- a/layout/base/tests/TestPoisonArea.cpp
|
|
+++ b/layout/base/tests/TestPoisonArea.cpp
|
|
@@ -392,53 +392,53 @@ ReservePoisonArea()
|
|
{
|
|
if (sizeof(uintptr_t) == 8) {
|
|
// Use the hardware-inaccessible region.
|
|
// We have to avoid 64-bit constants and shifts by 32 bits, since this
|
|
// code is compiled in 32-bit mode, although it is never executed there.
|
|
uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 |
|
|
uintptr_t(0xF0DEAFFFu)) &
|
|
~uintptr_t(PAGESIZE-1));
|
|
- printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result);
|
|
+ printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result);
|
|
return result;
|
|
} else {
|
|
// First see if we can allocate the preferred poison address from the OS.
|
|
uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1));
|
|
void *result = ReserveRegion(candidate, false);
|
|
if (result == (void *)candidate) {
|
|
// success - inaccessible page allocated
|
|
- printf("INFO | poison area allocated at 0x%.*"PRIxPTR
|
|
+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR
|
|
" (preferred addr)\n", SIZxPTR, (uintptr_t)result);
|
|
return candidate;
|
|
}
|
|
|
|
// That didn't work, so see if the preferred address is within a range
|
|
// of permanently inacessible memory.
|
|
if (ProbeRegion(candidate)) {
|
|
// success - selected page cannot be usable memory
|
|
if (result != MAP_FAILED)
|
|
ReleaseRegion(result);
|
|
- printf("INFO | poison area assumed at 0x%.*"PRIxPTR
|
|
+ printf("INFO | poison area assumed at 0x%.*" PRIxPTR
|
|
" (preferred addr)\n", SIZxPTR, candidate);
|
|
return candidate;
|
|
}
|
|
|
|
// The preferred address is already in use. Did the OS give us a
|
|
// consolation prize?
|
|
if (result != MAP_FAILED) {
|
|
- printf("INFO | poison area allocated at 0x%.*"PRIxPTR
|
|
+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR
|
|
" (consolation prize)\n", SIZxPTR, (uintptr_t)result);
|
|
return (uintptr_t)result;
|
|
}
|
|
|
|
// It didn't, so try to allocate again, without any constraint on
|
|
// the address.
|
|
result = ReserveRegion(0, false);
|
|
if (result != MAP_FAILED) {
|
|
- printf("INFO | poison area allocated at 0x%.*"PRIxPTR
|
|
+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR
|
|
" (fallback)\n", SIZxPTR, (uintptr_t)result);
|
|
return (uintptr_t)result;
|
|
}
|
|
|
|
printf("ERROR | no usable poison area found\n");
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -450,17 +450,17 @@ static uintptr_t
|
|
ReservePositiveControl()
|
|
{
|
|
|
|
void *result = ReserveRegion(0, false);
|
|
if (result == MAP_FAILED) {
|
|
printf("ERROR | allocating positive control | %s\n", LastErrMsg());
|
|
return 0;
|
|
}
|
|
- printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n",
|
|
+ printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n",
|
|
SIZxPTR, (uintptr_t)result);
|
|
return (uintptr_t)result;
|
|
}
|
|
|
|
/* The "negative control" area confirms that our probe logic does detect a
|
|
* page that is readable, writable, or executable.
|
|
*/
|
|
static uintptr_t
|
|
@@ -481,17 +481,17 @@ ReserveNegativeControl()
|
|
// Now mark it executable as well as readable and writable.
|
|
// (mmap(PROT_EXEC) may fail when applied to anonymous memory.)
|
|
|
|
if (MakeRegionExecutable(result)) {
|
|
printf("ERROR | making negative control executable | %s\n", LastErrMsg());
|
|
return 0;
|
|
}
|
|
|
|
- printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n",
|
|
+ printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n",
|
|
SIZxPTR, (uintptr_t)result);
|
|
return (uintptr_t)result;
|
|
}
|
|
|
|
static void
|
|
JumpTo(uintptr_t opaddr)
|
|
{
|
|
#ifdef __ia64
|
|
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
|
|
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
|
|
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
|
|
@@ -61,8 +61,11 @@ HOST_CPPSRCS = \
|
|
file_id.cc \
|
|
guid_creator.cc \
|
|
$(NULL)
|
|
|
|
# need static lib
|
|
FORCE_STATIC_LIB = 1
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
+
|
|
+# See https://bugzilla.mozilla.org/show_bug.cgi?id=741348#c11
|
|
+file_id.$(OBJ_SUFFIX): STL_FLAGS=
|