rpms/qt/devel qt-x11-opensource-src-4.5.0-linguist-crash.patch, NONE, 1.1 qt.spec, 1.252, 1.253
Than Ngo
than at fedoraproject.org
Mon Mar 16 23:55:21 UTC 2009
Author: than
Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30513
Modified Files:
qt.spec
Added Files:
qt-x11-opensource-src-4.5.0-linguist-crash.patch
Log Message:
fix lupdate segfault (#486866)
qt-x11-opensource-src-4.5.0-linguist-crash.patch:
--- NEW FILE qt-x11-opensource-src-4.5.0-linguist-crash.patch ---
diff -up qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp.orig qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp
--- qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp.orig 2009-03-16 12:50:03.000000000 +0100
+++ qt-x11-opensource-src-4.5.0/tools/linguist/shared/profileevaluator.cpp 2009-03-17 00:42:51.000000000 +0100
@@ -86,6 +86,7 @@ public:
void enterScope(bool multiLine);
void leaveScope();
void finalizeBlock();
+ void cleanup();
// implementation of AbstractProItemVisitor
bool visitBeginProBlock(ProBlock *block);
@@ -164,6 +165,15 @@ ProFileEvaluator::Private::Private(ProFi
m_contNextLine = false;
}
+void ProFileEvaluator::Private::cleanup()
+{
+ m_commentItem = 0;
+ m_block = 0;
+ m_proitem.clear();
+ m_blockstack.clear();
+ m_pendingComment.clear();
+}
+
bool ProFileEvaluator::Private::read(ProFile *pro)
{
QFile file(pro->fileName());
@@ -180,11 +190,14 @@ bool ProFileEvaluator::Private::read(Pro
while (!ts.atEnd()) {
QString line = ts.readLine();
if (!parseLine(line)) {
+ cleanup();
q->errorMessage(format(".pro parse failure."));
return false;
}
++m_lineNo;
}
+
+ cleanup();
return true;
}
Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- qt.spec 15 Mar 2009 07:22:22 -0000 1.252
+++ qt.spec 16 Mar 2009 23:54:50 -0000 1.253
@@ -12,7 +12,7 @@
Name: qt4
%endif
Version: 4.5.0
-Release: 5%{?dist}
+Release: 6%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -38,6 +38,8 @@
Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
+Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch
+
## upstreamable bits
# http://bugzilla.redhat.com/485677
Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
@@ -306,6 +308,7 @@
%endif
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch10 -p1 -b .ppc64
+%patch11 -p1 -b .linguist-crash
%patch50 -p1 -b .qhostaddress
%patch51 -p1 -b .qdoc3
%patch52 -p1 -b .sparc64
@@ -779,6 +782,9 @@
%changelog
+* Tue Mar 17 2009 Than Ngo <than at redhat.com> - 4.5.0-6
+- fix lupdate segfault (#486866)
+
* Sat Mar 14 2009 Dennis Gilmore <dennis at ausil.us> - 4.5.0-5
- add patch for sparc64.
- _Atomic_word is not always an int
More information about the fedora-extras-commits
mailing list