[SCM] Qt 4 packaging branch, master, updated. debian/4.7.4-2-1-gbf81d97

[Fathi Boudra]

The following commit has been merged in the master branch:
commit bf81d9707697e5b23a49895641793ebff49c3f90
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Jan 6 21:56:12 2012 +0200

    Add CVE-2011-3922.patch: Stack-buffer-overflow in glyph handling.
---
 debian/changelog                   |    6 ++++++
 debian/patches/CVE-2011-3922.patch |   14 ++++++++++++++
 debian/patches/series              |    1 +
 3 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff898fb..0bfe152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.7.4-3) UNRELEASED; urgency=low
+
+  * Add CVE-2011-3922.patch: Stack-buffer-overflow in glyph handling.
+
+ -- Fathi Boudra <fabo at debian.org>  Fri, 06 Jan 2012 21:54:25 +0200
+
 qt4-x11 (4:4.7.4-2) unstable; urgency=low
 
   * Update debian/rules: build documentation in dh_auto_install so it is only
diff --git a/debian/patches/CVE-2011-3922.patch b/debian/patches/CVE-2011-3922.patch
new file mode 100644
index 0000000..5753dbc
--- /dev/null
+++ b/debian/patches/CVE-2011-3922.patch
@@ -0,0 +1,14 @@
+---
+ src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c
++++ b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c
+@@ -359,6 +359,7 @@ static HB_Bool myanmar_shape_syllable(HB
+         if (kinzi >= 0 && i > base && (cc & Mymr_CF_AFTER_KINZI)) {
+             reordered[len] = Mymr_C_NGA;
+             reordered[len+1] = Mymr_C_VIRAMA;
++            if (len > 0)
+             properties[len-1] = AboveForm;
+             properties[len] = AboveForm;
+             len += 2;
diff --git a/debian/patches/series b/debian/patches/series
index 84a262a..14e5289 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,3 +53,4 @@ s390x_jscore.diff
 blacklist-diginotar-cert.diff
 openssl_no_ssl2.patch
 Remove_QtHelp_dependency_on_QtXml.patch
+CVE-2011-3922.patch

-- 
Qt 4 packaging