diff options
| author | Eike Rathke <erack@redhat.com> | 2017-11-08 17:17:44 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-11-08 17:19:21 +0100 |
| commit | cebe1279665960b732c9cb05c18e481c33e778bb (patch) | |
| tree | 1e6358a19cd214ff551e9a08e0de28a7602cb6d8 | |
| parent | 5a33306a377e7fa29303395dc361efa262787264 (diff) | |
Add ICU changeset-40324 fix for CVE-2017-14952
Change-Id: Ia457669c5ec6ef5c568f4550c44ef5df32a4be66
| -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 ca523006307c..7bf2926e5a83 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -37,6 +37,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-59-werror-undef.patch.1 \ external/icu/icu4c-59-werror-shadow.patch.1 \ external/icu/icu4c-59-icu13329-xlocale.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; |