diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-11-30 20:38:42 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-30 20:38:42 +0000 |
commit | a66451887425ddd9387e2b25d5125916f4a35f83 (patch) | |
tree | 4c557b68d446f1d1af35a2590b7a41077abf2d1e /external/icu | |
parent | fix higher debug level build (diff) | |
download | core-a66451887425ddd9387e2b25d5125916f4a35f83.tar.gz core-a66451887425ddd9387e2b25d5125916f4a35f83.zip |
mirror fixes for fdo#78906 and deb#766788 into icu
Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9
Diffstat (limited to 'external/icu')
-rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
-rw-r--r-- | external/icu/icu4c-scriptrun.patch | 58 |
2 files changed, 59 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 0f6ecd1fac13..d541e2ec4372 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -25,6 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-icu11054.patch.1 \ external/icu/icu4c-icu11100.patch.1 \ external/icu/icu4c-icu11131.patch.1 \ + external/icu/icu4c-scriptrun.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/icu/icu4c-scriptrun.patch b/external/icu/icu4c-scriptrun.patch new file mode 100644 index 000000000000..e307811acaad --- /dev/null +++ b/external/icu/icu4c-scriptrun.patch @@ -0,0 +1,58 @@ +--- misc/icu/source/extra/scrptrun/scrptrun.cpp ++++ misc/build/icu/source/extra/scrptrun/scrptrun.cpp +@@ -150,7 +150,11 @@ + // characters above it on the stack will be poped. + if (pairIndex >= 0) { + if ((pairIndex & 1) == 0) { +- parenStack[++parenSP].pairIndex = pairIndex; ++ ++parenSP; ++ int32_t nVecSize = parenStack.size(); ++ if (parenSP == nVecSize) ++ parenStack.resize(nVecSize + 128); ++ parenStack[parenSP].pairIndex = pairIndex; + parenStack[parenSP].scriptCode = scriptCode; + } else if (parenSP >= 0) { + int32_t pi = pairIndex & ~1; +@@ -184,7 +188,14 @@ + // pop it from the stack + if (pairIndex >= 0 && (pairIndex & 1) != 0 && parenSP >= 0) { + parenSP -= 1; +- startSP -= 1; ++ /* decrement startSP only if it is >= 0, ++ decrementing it unnecessarily will lead to memory corruption ++ while processing the above while block. ++ e.g. startSP = -4 , parenSP = -1 ++ */ ++ if (startSP >= 0) { ++ startSP -= 1; ++ } + } + } else { + // if the run broke on a surrogate pair, +--- misc/icu/source/extra/scrptrun/scrptrun.h ++++ misc/build/icu/source/extra/scrptrun/scrptrun.h +@@ -17,6 +17,7 @@ + #include "unicode/utypes.h" + #include "unicode/uobject.h" + #include "unicode/uscript.h" ++#include <vector> + + struct ScriptRecord + { +@@ -79,7 +80,7 @@ + int32_t scriptEnd; + UScriptCode scriptCode; + +- ParenStackEntry parenStack[128]; ++ std::vector<ParenStackEntry> parenStack; + int32_t parenSP; + + static int8_t highBit(int32_t value); +@@ -133,6 +134,7 @@ + scriptEnd = charStart; + scriptCode = USCRIPT_INVALID_CODE; + parenSP = -1; ++ parenStack.resize(128); + } + + inline void ScriptRun::reset(int32_t start, int32_t length) |