forked from pool/MozillaFirefox
bf5fb37f98
* rebased patches * requires NSS 3.15.2 or above * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592 Miscellaneous memory safety hazards * MFSA 2013-94/CVE-2013-5593 (bmo#868327) Spoofing addressbar through SELECT element * MFSA 2013-95/CVE-2013-5604 (bmo#914017) Access violation with XSLT and uninitialized data * MFSA 2013-96/CVE-2013-5595 (bmo#916580) Improperly initialized memory and overflows in some JavaScript functions * MFSA 2013-97/CVE-2013-5596 (bmo#910881) Writing to cycle collected object during image decoding * MFSA 2013-98/CVE-2013-5597 (bmo#918864) Use-after-free when updating offline cache * MFSA 2013-99/CVE-2013-5598 (bmo#920515) Security bypass of PDF.js checks using iframes * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601 (bmo#915210, bmo#915576, bmo#916685) Miscellaneous use-after-free issues found through ASAN fuzzing * MFSA 2013-101/CVE-2013-5602 (bmo#897678) Memory corruption in workers * MFSA 2013-102/CVE-2013-5603 (bmo#916404) Use-after-free in HTML document templates OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=356
91 lines
3.3 KiB
Diff
91 lines
3.3 KiB
Diff
# HG changeset patch
|
|
# Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf
|
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
|
Bug 746112 - RegExp hang on ppc64 in execute.
|
|
|
|
diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
|
|
--- a/js/src/yarr/YarrInterpreter.h
|
|
+++ b/js/src/yarr/YarrInterpreter.h
|
|
@@ -162,17 +162,17 @@ struct ByteTerm {
|
|
, m_invert(invert)
|
|
{
|
|
atom.characterClass = characterClass;
|
|
atom.quantityType = QuantifierFixedCount;
|
|
atom.quantityCount = 1;
|
|
inputPosition = inputPos;
|
|
}
|
|
|
|
- ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos)
|
|
+ ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline))
|
|
: type(type)
|
|
, m_capture(capture)
|
|
, m_invert(false)
|
|
{
|
|
atom.subpatternId = subpatternId;
|
|
atom.parenthesesDisjunction = parenthesesInfo;
|
|
atom.quantityType = QuantifierFixedCount;
|
|
atom.quantityCount = 1;
|
|
@@ -183,17 +183,17 @@ struct ByteTerm {
|
|
: type(type)
|
|
, m_capture(false)
|
|
, m_invert(invert)
|
|
{
|
|
atom.quantityType = QuantifierFixedCount;
|
|
atom.quantityCount = 1;
|
|
}
|
|
|
|
- ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos)
|
|
+ ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline))
|
|
: type(type)
|
|
, m_capture(capture)
|
|
, m_invert(invert)
|
|
{
|
|
atom.subpatternId = subpatternId;
|
|
atom.quantityType = QuantifierFixedCount;
|
|
atom.quantityCount = 1;
|
|
inputPosition = inputPos;
|
|
diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h
|
|
--- a/js/src/yarr/YarrPattern.h
|
|
+++ b/js/src/yarr/YarrPattern.h
|
|
@@ -180,17 +180,17 @@ struct PatternTerm {
|
|
, m_capture(false)
|
|
, m_invert(invert)
|
|
{
|
|
characterClass = charClass;
|
|
quantityType = QuantifierFixedCount;
|
|
quantityCount = 1;
|
|
}
|
|
|
|
- PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false)
|
|
+ PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline))
|
|
: type(type)
|
|
, m_capture(capture)
|
|
, m_invert(invert)
|
|
{
|
|
parentheses.disjunction = disjunction;
|
|
parentheses.subpatternId = subpatternId;
|
|
parentheses.isCopy = false;
|
|
parentheses.isTerminal = false;
|
|
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
|
|
--- a/memory/mozjemalloc/jemalloc.c
|
|
+++ b/memory/mozjemalloc/jemalloc.c
|
|
@@ -1099,17 +1099,17 @@ struct arena_s {
|
|
static unsigned ncpus;
|
|
#endif
|
|
|
|
/*
|
|
* When MALLOC_STATIC_SIZES is defined most of the parameters
|
|
* controlling the malloc behavior are defined as compile-time constants
|
|
* for best performance and cannot be altered at runtime.
|
|
*/
|
|
-#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__)
|
|
+#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(defined(__powerpc__))
|
|
#define MALLOC_STATIC_SIZES 1
|
|
#endif
|
|
|
|
#ifdef MALLOC_STATIC_SIZES
|
|
|
|
/*
|
|
* VM page size. It must divide the runtime CPU page size or the code
|
|
* will abort.
|