fix assert with invalid sting length

Change-Id: Ie6730283b0dcecc0746cc15d093ff58ba187cff1

fix assert with invalid sting length
Change-Id: Ie6730283b0dcecc0746cc15d093ff58ba187cff1
ded55489 · Markus Mohrhard · fadbb2e7 · ded55489
Kaydet (Commit) ded55489 authored Eki 28, 2013 tarafından Markus Mohrhard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

interpr1.cxx sc/source/core/tool/interpr1.cxx +4 -1

No files found.
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8071,7 +8071,10 @@ void ScInterpreter::ScMid()
        if (fAnfang < 1.0 || fAnz < 0.0 || fAnfang > double(STRING_MAXLEN) || fAnz > double(STRING_MAXLEN))
            PushIllegalArgument();
        else
-            PushString(aStr.copy(static_cast<sal_Int32>(fAnfang-1), static_cast<sal_Int32>(fAnz)));
+        {
+            sal_Int32 nCharacters = std::min<sal_Int32>(static_cast<sal_Int32>(fAnz), aStr.getLength() - fAnfang + 1);
+            PushString(aStr.copy(static_cast<sal_Int32>(fAnfang-1), nCharacters));
+        }
    }
 }