[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - external/icu

[Eike Rathke]

 external/icu/UnpackedTarball_icu.mk        |    1 +
 external/icu/icu4c-changeset-40324.patch.1 |   11 +++++++++++
 2 files changed, 12 insertions(+)

New commits:
commit 7637c1534b81e58459292d202c49b58f50ab7688
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Nov 8 17:17:44 2017 +0100

    Add ICU changeset-40324 fix for CVE-2017-14952
    
    (cherry picked from commit cebe1279665960b732c9cb05c18e481c33e778bb)
    
     Conflicts:
            external/icu/UnpackedTarball_icu.mk
    
    Change-Id: Ia457669c5ec6ef5c568f4550c44ef5df32a4be66
    Reviewed-on: https://gerrit.libreoffice.org/44492
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index fae37f5dd922..cffdcdec3cc8 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
 	external/icu/khmerbreakengine.patch \
 	external/icu/icu4c-changeset-39671.patch.1 \
+	external/icu/icu4c-changeset-40324.patch.1 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-changeset-40324.patch.1 b/external/icu/icu4c-changeset-40324.patch.1
new file mode 100644
index 000000000000..a651eb19415d
--- /dev/null
+++ b/external/icu/icu4c-changeset-40324.patch.1
@@ -0,0 +1,11 @@
+# https://ssl.icu-project.org/trac/changeset/40324/trunk/icu4c/source/i18n/zonemeta.cpp
+Index: trunk/icu4c/source/i18n/zonemeta.cpp
+===================================================================
+--- icu.orig/source/i18n/zonemeta.cpp
++++ icu/source/i18n/zonemeta.cpp
+@@ -691,5 +691,4 @@
+                     if (U_FAILURE(status)) {
+                         delete mzMappings;
+-                        deleteOlsonToMetaMappingEntry(entry);
+                         uprv_free(entry);
+                         break;