summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-20 09:38:34 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-20 09:39:40 +0100
commitd01ee7e2cc7315728a5a8e04bb1d6847ec185483 (patch)
treecb5ca1f4f48953084ab07c277f6ad15158f99391 /svl
parent3f210b0e75ba338306f3ddb7f237db5ddb2c8f2d (diff)
fix string out-of-bounds assert on gnome627759-1.ods
i.e. on soffice --headless --convert-to pdf gnome627759-1.ods Change-Id: I01289d5afcc79b7180cc12f8ee345ac760b6a637
Diffstat (limited to 'svl')
-rw-r--r--svl/source/numbers/zformat.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 633b80389ecc..aa0b8a657c14 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4359,7 +4359,8 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
}
break;
case NF_SYMBOLTYPE_BLANK:
- /*k = */ InsertBlanks(sStr, k, rInfo.sStrArray[j][1] );
+ if (rInfo.sStrArray[j].getLength() >= 2)
+ /*k = */ InsertBlanks(sStr, k, rInfo.sStrArray[j][1] );
break;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_CURRENCY:
@@ -4492,7 +4493,8 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb
}
break;
case NF_SYMBOLTYPE_BLANK:
- /*k = */ InsertBlanks(sBuff, k, rInfo.sStrArray[j][1] );
+ if (rInfo.sStrArray[j].getLength() >= 2)
+ /*k = */ InsertBlanks(sBuff, k, rInfo.sStrArray[j][1] );
break;
case NF_SYMBOLTYPE_THSEP:
// #i7284# #102685# Insert separator also if number is divided