sc/source/core/tool/interpr1.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 929ab83d93da4250cc55aee96738c8b1b4f55c1d
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Nov 6 15:31:53 2013 +0000
check for valid string len
as demonstrated by fdo59762-2.ods
Change-Id: I36cddaba5f664d5d95e9a661eed1cbe9dec1c273
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 952e50c..3e8a537 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8061,7 +8061,6 @@ void ScInterpreter::ScSearch()
}
}
-
void ScInterpreter::ScMid()
{
if ( MustHaveParamCount( GetByte(), 3 ) )
@@ -8074,12 +8073,14 @@ void ScInterpreter::ScMid()
else
{
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));
+ OUString sRes;
+ if (nCharacters > 0)
+ sRes = aStr.copy(static_cast<sal_Int32>(fAnfang-1),
nCharacters);
+ PushString(sRes);
}
}
}
-
void ScInterpreter::ScText()
{
if ( MustHaveParamCount( GetByte(), 2 ) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
