From 132e4f4ae735c1d8d216777ba13a3c60d540671b Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Sep 17 2007 15:12:32 +0000
Subject: CVE-2007-4137


---

diff --git a/qt-3.3.6-bz#292941-CVE-2007-4137.patch b/qt-3.3.6-bz#292941-CVE-2007-4137.patch
new file mode 100644
index 0000000..06ae9e5
--- /dev/null
+++ b/qt-3.3.6-bz#292941-CVE-2007-4137.patch
@@ -0,0 +1,11 @@
+--- src/codecs/qutfcodec.cpp
++++ src/codecs/qutfcodec.cpp
+@@ -165,7 +165,7 @@ public:
+     QString toUnicode(const char* chars, int len)
+     {
+ 	QString result;
+-	result.setLength( len ); // worst case
++	result.setLength( len + 1 ); // worst case
+ 	QChar *qch = (QChar *)result.unicode();
+ 	uchar ch;
+         int error = -1;
diff --git a/qt.spec b/qt.spec
index 8291ff6..248abbd 100644
--- a/qt.spec
+++ b/qt.spec
@@ -1,7 +1,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: 3.3.8
-Release: 6%{?dist}.1
+Release: 7%{?dist}
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -65,6 +65,7 @@ Patch201: qt-x11-free-3.3.8-bz#243722-mysql.patch
 # security patces
 Patch300: qt3-CVE-2007-3388.patch
 Patch301: utf8-bug-qt3-CVE-2007-0242.diff
+Patch302: qt-3.3.6-bz#292941-CVE-2007-4137.patch
 
 %define qt_dirname qt-3.3
 %define qtdir %{_libdir}/%{qt_dirname}
@@ -305,6 +306,7 @@ for the Qt toolkit.
 # security patches
 %patch300 -p1 -b .CVE-2007-3388
 %patch301 -p0 -b .CVE-2007-0242
+%patch302 -p0 -b .CVE-2007-4137
 
 # convert to UTF-8
 iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
@@ -576,6 +578,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mo Sep 17 2007 Than Ngo <than@redhat.com> - 1:3.3.8-7
+- CVE-2007-4137
+
 * Wed Aug 29 2007 Than Ngo <than@redhat.com> - 1:3.3.8-6.fc7.1
 - cleanup security patch