[Libreoffice-commits] .: Branch 'libreoffice-3-5' - icu/CVE-2011-4599.patch icu/makefile.mk

[Caolán McNamara]

 icu/CVE-2011-4599.patch |   20 ++++++++++++++++++++
 icu/makefile.mk         |    3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit bba94fcd7ed28cf2f927df4d898e38c6cb97f4af
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 12 12:44:34 2011 +0000

    Resolves: CVE-2011-4599
    (cherry picked from commit cf5d0e20f2ba5a71f9ca2ed78a1b24841c97bb06)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/icu/CVE-2011-4599.patch b/icu/CVE-2011-4599.patch
new file mode 100644
index 0000000..fd8b121
--- /dev/null
+++ b/icu/CVE-2011-4599.patch
@@ -0,0 +1,20 @@
+--- misc/icu/source/source/common/uloc.c
++++ misc/build/icu/source/common/uloc.c
+@@ -1797,7 +1797,7 @@
+                 int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n);
+                 len -= variantLen;
+                 if (variantLen > 0) {
+-                    if (name[len-1] == '_') { /* delete trailing '_' */
++                    if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */
+                         --len;
+                     }
+                     addKeyword = VARIANT_MAP[j].keyword;
+@@ -1805,7 +1805,7 @@
+                     break;
+                 }
+             }
+-            if (name[len-1] == '_') { /* delete trailing '_' */
++            if (len > 0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */
+                 --len;
+             }
+         }
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 595ed20..cb02475 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -52,7 +52,8 @@ PATCH_FILES=\
     icu4c-4_4_2-wchar_t.patch \
     icu4c-warnings.patch \
     icu4c-escapespace.patch \
-    icu4c-strict-c.patch
+    icu4c-strict-c.patch \
+    CVE-2011-4599.patch
 
 .IF "$(OS)"=="ANDROID"
 PATCH_FILES+=\