[Libreoffice-commits] core.git: external/icu

[David Tardon]

 external/icu/UnpackedTarball_icu.mk |    1 +
 external/icu/ofz4860.patch.2        |   25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

New commits:
commit 2b69156c43261ceae55eb4d3b644c4c2d73231ba
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Mar 6 15:17:13 2018 +0100

    forcepoint: fix out-of-bounds read in ICU
    
    Change-Id: I5061d38d0e7df0de9a5c7574d522ce69934e4a24

diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 499650976a55..a4d0b16ecb36 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
 	external/icu/icu4c-khmerbreakengine.patch.1 \
 	external/icu/icu4c-59-werror-shadow.patch.1 \
+	external/icu/ofz4860.patch.2 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/ofz4860.patch.2 b/external/icu/ofz4860.patch.2
new file mode 100644
index 000000000000..14114d52878b
--- /dev/null
+++ b/external/icu/ofz4860.patch.2
@@ -0,0 +1,25 @@
+From 529ba01ee606940ca273b187be8ce9ba31cf2d90 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Fri, 19 Jan 2018 10:41:02 +0100
+Subject: [PATCH] ofz#4860 fix past-the-end read from array
+
+---
+ icu4c/source/common/locmap.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp
+index cbb2b810a..6d62d8310 100644
+--- a/icu4c/source/common/locmap.cpp
++++ b/icu4c/source/common/locmap.cpp
+@@ -1015,7 +1015,7 @@ static const char*
+ getPosixID(const ILcidPosixMap *this_0, uint32_t hostID)
+ {
+     uint32_t i;
+-    for (i = 0; i <= this_0->numRegions; i++)
++    for (i = 0; i < this_0->numRegions; i++)
+     {
+         if (this_0->regionMaps[i].hostID == hostID)
+         {
+-- 
+2.14.3
+