commit 9e4d52712fce4c2a8e80060e05ecc180bda00d67
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Oct 24 09:58:42 2012 -0500
Crash in Qt script (QTBUG-27322)
...erywhere-opensource-src-4.8.3-QTBUG-27322.patch | 14 ++++++++++++++
qt.spec | 13 ++++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch b/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
new file mode 100644
index 0000000..764e77e
--- /dev/null
+++ b/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
@@ -0,0 +1,14 @@
+diff -up qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp.QTBUG-27322 qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
+--- qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp.QTBUG-27322 2012-10-24 09:52:55.183430410 -0500
++++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp 2012-10-24 09:53:49.996758727 -0500
+@@ -305,8 +305,8 @@ public:
+ randomLocation += (1 << 24);
+ randomLocation <<= 21;
+ #endif
+- m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
+- if (!m_base)
++ m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
++ if (m_base == MAP_FAILED)
+ CRASH();
+
+ // For simplicity, we keep all memory in m_freeList in a 'released' state.
diff --git a/qt.spec b/qt.spec
index 4cebc09..213130a 100644
--- a/qt.spec
+++ b/qt.spec
@@ -16,7 +16,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.3
-Release: 6%{?dist}
+Release: 7%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -127,6 +127,9 @@ Patch101: qt-everywhere-opensource-src-4.8.3-qdevice_pri.patch
# https://bugs.kde.org/show_bug.cgi?id=297661
# REVERT for now, http://bugzilla.redhat.com/853587, https://bugreports.qt-project.org/browse/QTBUG-27322
Patch103: qt-Fix-JIT-crash-on-x86-64-avoid-32-bit-branch-offset-o.patch
+# followup for fix JIT crash
+# https://bugreports.qt-project.org/browse/QTBUG-27322
+Patch104: qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
# security patches
# CVE-2011-3922 qt: Stack-based buffer overflow in embedded harfbuzz code
@@ -468,7 +471,8 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch100 -p1 -b .QTgaHandler
%patch101 -p1 -b .qdevice_pri
## 4.8.3 includes this patch, revert it to avoid regressions for now -- rex
-%patch103 -p1 -R -b .QtScript_JIT
+#patch103 -p1 -R -b .QtScript_JIT
+%patch104 -p1 -b .QTBUG-27322
# security fixes
%patch200 -p1 -b .CVE-2011-3922
@@ -1105,7 +1109,10 @@ fi
%changelog
-* Tue Oct 23 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.3-6
+* Wed Oct 24 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.3-7
+- Crash in Qt script (QTBUG-27322)
+
+* Tue Oct 23 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.3-6
- fix/respin qdevice_pri patch
* Mon Oct 22 2012 Rex Dieter <rdieter at fedoraproject.org> 1:4.8.3-5