From c37a25191872aeeef02755061b9af2463e22ea86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 29 Aug 2014 14:34:41 +0100 Subject: [PATCH] Resolves: rhbz#1135410 Change-Id: Iaa62d8438012e32167c9179da29c446850cf1deb --- external/icu/icu4c-icu11131.patch.1 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/external/icu/icu4c-icu11131.patch.1 b/external/icu/icu4c-icu11131.patch.1 index 58364b026b42..e9978aba7a8e 100644 --- a/external/icu/icu4c-icu11131.patch.1 +++ b/external/icu/icu4c-icu11131.patch.1 @@ -42,5 +42,27 @@ + } + return u_terminateUChars(dest, destCapacity, b2Len, status); } + + +--- icu/source/common/ubidi.c.orig 2014-08-29 14:32:24.007259924 +0100 ++++ icu/source/common/ubidi.c 2014-08-29 14:33:21.555833532 +0100 +@@ -2521,11 +2521,18 @@ + pBiDi->trailingWSStart=saveTrailingWSStart; + /* free memory for mapping table and visual text */ + uprv_free(runsOnlyMemory); ++ runsOnlyMemory=NULL; + if(pBiDi->runCount>1) { + pBiDi->direction=UBIDI_MIXED; + } + cleanup3: +- pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY; ++ if(runsOnlyMemory != NULL) ++ { ++ pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY; ++ uprv_free(runsOnlyMemory); ++ } ++ else ++ pBiDi->reorderingMode=UBIDI_REORDER_RUNS_ONLY; + } - + /* ubidi_setPara ------------------------------------------------------------ */