summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2012-07-20 20:46:32 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2012-07-20 20:46:32 -0300
commit970bcb13f1be83641d71eebfa75c4de070929863 (patch)
tree6f42e9456632968ef5e7059551574d4b65cf46c9
parent330efa4d3620a8cbeb08f65148100c96aa6ddeed (diff)
downloadqt4-x11-970bcb13f1be83641d71eebfa75c4de070929863.tar.gz
Basic patch.
It still needs proper filling of the tags.
-rw-r--r--debian/patches/fix_use_after_free_qlocale_unix.patch21
-rw-r--r--debian/patches/series1
2 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/fix_use_after_free_qlocale_unix.patch b/debian/patches/fix_use_after_free_qlocale_unix.patch
new file mode 100644
index 0000000..f2db126
--- /dev/null
+++ b/debian/patches/fix_use_after_free_qlocale_unix.patch
@@ -0,0 +1,21 @@
+Description: fix use after free in qlocale_unix.cpp
+ This patch avoids the use of the returned variable when the destructor
+ gets called.
+Author: Julien Cristau <julien.cristau@logilab.fr>
+Bug-Debian: http://bugs.debian.org/681476
+Origin: <vendor|upstream|other>, <url of original patch>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2012-07-20
+
+--- qt4-x11-4.8.2.orig/src/corelib/tools/qlocale_unix.cpp
++++ qt4-x11-4.8.2/src/corelib/tools/qlocale_unix.cpp
+@@ -52,7 +52,7 @@
+
+ QT_BEGIN_NAMESPACE
+
+-static const char *getSystemLocale()
++static QByteArray *getSystemLocale()
+ {
+ #if defined(Q_OS_QNX)
+ static char buff[257];
diff --git a/debian/patches/series b/debian/patches/series
index f7b6174..adb61a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,3 +46,4 @@ CVE-2011-3922.patch
qt_atomic_sparc64.patch
no_libicu_message.diff
QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
+fix_use_after_free_qlocale_unix.patch