rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f16

Browse Source
This commit is contained in:
Jaroslav Reznik 2012-04-03 11:14:37 +02:00
commit 04fc6818ae
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp
--- qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 2012-03-14 15:01:14.000000000 +0100
+++ qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp 2012-04-03 10:53:12.973058622 +0200
@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPo
int pos = *cursorPos;
int itm;
const HB_CharAttributes *attributes = eng->attributes();
+ if (!attributes) {
+ *cursorPos = 0;
+ return x.toReal();
+ }
while (pos < line.from + line.length && !attributes[pos].charStop)
pos++;
if (pos == line.from + (int)line.length) {

9
qt.spec
View File

@ -11,7 +11,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.1 Version: 4.8.1
Release: 4%{?dist} Release: 5%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # 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 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -108,6 +108,9 @@ Patch81: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch
# upstream patches # upstream patches
# http://codereview.qt-project.org/#change,22006 # http://codereview.qt-project.org/#change,22006
Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch
# Fix a crash in cursorToX() when new block is added
# http://codereview.qt-project.org/22142
Patch101: qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch
# security patches # security patches
# CVE-2011-3922 qt: Stack-based buffer overflow in embedded harfbuzz code # CVE-2011-3922 qt: Stack-based buffer overflow in embedded harfbuzz code
@ -439,6 +442,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
# upstream patches # upstream patches
%patch100 -p1 -b .QTgaHandler %patch100 -p1 -b .QTgaHandler
%patch101 -p1 -b .QTBUG-24718
# security fixes # security fixes
%patch200 -p1 -b .CVE-2011-3922 %patch200 -p1 -b .CVE-2011-3922
@ -1063,6 +1067,9 @@ fi
%changelog %changelog
* Tue Apr 03 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.1-5
- Fix a crash in cursorToX() when new block is added (QTBUG-24718)
* Fri Mar 30 2012 Than Ngo <than@redhat.com> - 4.8.1-4 * Fri Mar 30 2012 Than Ngo <than@redhat.com> - 4.8.1-4
- Fix QTgaHandler::canRead() not obeying image plugin specs - Fix QTgaHandler::canRead() not obeying image plugin specs