[SCM] Qt 4 packaging branch, squeeze, updated. debian/4.6.3-4+squeeze1-6-g36c5a8e

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=36c5a8e

The following commit has been merged in the squeeze branch:
commit 36c5a8ef5c589c72882b0922eaf5c5509a497839
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Feb 9 14:42:28 2013 -0300

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

diff --git a/debian/changelog b/debian/changelog
index 38ac3c8..5eb1173 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qt4-x11 (4:4.6.3-4+squeeze2) UNRELEASED; urgency=high
     - (Malaysian) Digicert Sdn. Bhd.
     - Turktrust.
     Patch ssl_certificates_blacklist.patch.
+  * Add CVE-2011-3922.patch: Stack-buffer-overflow in glyph handling.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Feb 2013 13:43:51 -0300
 
diff --git a/debian/patches/CVE-2011-3922.patch b/debian/patches/CVE-2011-3922.patch
new file mode 100644
index 0000000..8a51b92
--- /dev/null
+++ b/debian/patches/CVE-2011-3922.patch
@@ -0,0 +1,17 @@
+Description: Stack-buffer-overflow in glyph handling.
+ Credit to Google Chrome Security Team (Cris Neckar).
+
+---
+ 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 74b0000..c972b18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ blacklist_fraudulent_comodo_certificates.diff
 cve_2010_3170_ssl_certificates_wildcard.diff
 change_all_shmget_calls_to_use_user-only_memory.patch
 ssl_certificates_blacklist.patch
+CVE-2011-3922.patch
 
 # qt-copy patches
 0180-window-role.diff

-- 
Qt 4 packaging