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

[Caolán McNamara]

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

New commits:
commit 915153b2e14dd75a6c90f5f4b1ac01b7f47bafdb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 19 10:40:02 2014 +0000

    icu#11451 bidi, the gift that keeps on giving
    
    Change-Id: I3bd37f8468c95a29ab3385dbc3ae825b76d8d3df
    (cherry picked from commit bfb9eb550c4facb9aa6346a8d19f015cf5182668)

diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index d541e2e..af9c751 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	external/icu/icu4c-icu11100.patch.1 \
 	external/icu/icu4c-icu11131.patch.1 \
 	external/icu/icu4c-scriptrun.patch \
+	external/icu/icu4c-icu11451.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11451.patch.1 b/external/icu/icu4c-icu11451.patch.1
new file mode 100644
index 0000000..b15185a
--- /dev/null
+++ b/external/icu/icu4c-icu11451.patch.1
@@ -0,0 +1,11 @@
+--- icu/source/common/ubidi.c.orig	2014-12-19 10:23:38.103928414 +0000
++++ icu/source/common/ubidi.c	2014-12-19 10:26:58.370071527 +0000
+@@ -2146,7 +2146,7 @@
+     /* The isolates[] entries contain enough information to
+        resume the bidi algorithm in the same state as it was
+        when it was interrupted by an isolate sequence. */
+-    if(dirProps[start]==PDI) {
++    if(dirProps[start]==PDI && pBiDi->isolateCount >= 0) {
+         levState.startON=pBiDi->isolates[pBiDi->isolateCount].startON;
+         start1=pBiDi->isolates[pBiDi->isolateCount].start1;
+         stateImp=pBiDi->isolates[pBiDi->isolateCount].stateImp;