diff -ur icu.org/source/extra/scrptrun/scrptrun.cpp icu/source/extra/scrptrun/scrptrun.cpp --- icu.org/source/extra/scrptrun/scrptrun.cpp 2017-01-20 01:20:31.000000000 +0100 +++ icu/source/extra/scrptrun/scrptrun.cpp 2017-04-21 22:59:31.708037770 +0200 @@ -151,7 +151,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; @@ -185,7 +189,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, diff -ur icu.org/source/extra/scrptrun/scrptrun.h icu/source/extra/scrptrun/scrptrun.h --- icu.org/source/extra/scrptrun/scrptrun.h 2017-01-20 01:20:31.000000000 +0100 +++ icu/source/extra/scrptrun/scrptrun.h 2017-04-21 22:59:31.708037770 +0200 @@ -19,6 +19,7 @@ #include "unicode/utypes.h" #include "unicode/uobject.h" #include "unicode/uscript.h" +#include U_NAMESPACE_BEGIN @@ -81,7 +82,7 @@ int32_t scriptEnd; UScriptCode scriptCode; - ParenStackEntry parenStack[128]; + std::vector parenStack; int32_t parenSP; static int8_t highBit(int32_t value); @@ -135,6 +136,7 @@ scriptEnd = charStart; scriptCode = USCRIPT_INVALID_CODE; parenSP = -1; + parenStack.resize(128); } inline void ScriptRun::reset(int32_t start, int32_t length) 3.4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/include/svx/langbox.hxx
AgeCommit message (Expand)Author
2023-06-06Drop the unneeded optimization for "[All]"Mike Kaganski
2023-06-06Sort languages in Edit Modules dialogMike Kaganski
2023-06-05Drop unneeded indirectionMike Kaganski
2023-06-05Drop duplicating functionMike Kaganski
2022-10-05Add on-the-fly language tag to proper language list Western/Asian/ComplexEike Rathke
2022-06-07Resolves tdf#146928 - Redesign charnamedialogHeiko Tietze
2022-04-29use more string_view in INetURLObjectNoel Grandin
2021-11-04use more DECL_DLLPRIVATE_LINKNoel Grandin
2020-09-02drop some unused methodsCaolán McNamara
2020-03-13Revert "loplugin:constfields in svx"Noel Grandin
2020-02-21loplugin:unusedmethodsNoel Grandin
2020-02-11tdf#114694: Make default value in language settings the first elementYusuf Keten
2020-02-02tdf#128302: Split SVXCORE_DLLPUBLIC from SVX_DLLPUBLICStephan Bergmann