diff options
| author | Eike Rathke <erack@redhat.com> | 2017-11-08 17:17:44 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-11-25 12:43:09 +0100 |
| commit | e7738ab7b824fde359a7783ab65a4f4a26675528 (patch) | |
| tree | 6ce47322a087f6f520578a2b7be63e8b2f5c07a5 | |
| parent | 7f1297d9b4f449eb9ada8008fb21b7046d1a8f19 (diff) | |
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/44494
Tested-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/icu4c-changeset-40324.patch.1 | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 58fedc9f3951..f1658a229586 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ $(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \ 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; |