diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-05-23 23:57:50 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-06-07 11:48:57 +0200 |
| commit | ef117cad3a13fda0932bd3da6c032f3499eb9069 (patch) | |
| tree | 8d305164db0b8425cb48db6e8683c3fddc543bd0 /basic | |
| parent | 9d1edef89b5a8cb333dfdd12631a9fa2ce3d482d (diff) | |
tdf#108039: check for nullptr in rtl_uString and OUString
rtl_[u]String_newConcat now checks allocation result to return
early and avoid SIGSEGV. Other functions are not modified, to
keep old behavior relying on allocation success and crashing
early on OOM to avoid added overhead in performance-critical
places.
OUString operator+= now checks rtl_uString_newConcat result and
throws std::bad_alloc on failure, to specifically address BASIC
problem. It keeps strong exception guarantee of leaving this'
state unaltered.
Concatenation in BASIC now checks for bad string allocation
(previously SIGSEGV was generated).
Unit test included.
Change-Id: I1513311d3d58eac43b2d2ec9a230e22dff0b4245
Reviewed-on: https://gerrit.libreoffice.org/37965
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/qa/basic_coverage/test_string_overflow_safe.vb | 22 | ||||
| -rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 9 |
2 files changed, 29 insertions, 2 deletions
diff --git a/basic/qa/basic_coverage/test_string_overflow_safe.vb b/basic/qa/basic_coverage/test_string_overflow_safe.vb new file mode 100644 index 000000000000..148cc910c7f5 --- /dev/null +++ b/basic/qa/basic_coverage/test_string_overflow_safe.vb @@ -0,0 +1,22 @@ +Option Explicit + +Function doUnitTest As Integer + ' Trying to create too long string should generate proper BASIC overflow error. + ' Longest possible string is 2147483638 wchar_t (2G - 10). + ' This tries to create string with 2G wchar_t. If it does not overflow, test fails. + ' If overflow is not safe, it segfaults. + On Error GoTo errorHandler + Dim s As String, i As Integer + s = "0" + For i=1 To 31 + s = s & s + Next i + doUnitTest = 0 + Exit Function +errorHandler: + If ( Err <> 6 ) Then + doUnitTest = 0 + Else + doUnitTest = 1 + Endif +End Function diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index bca0f80f8d2f..7ff177d8a736 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -875,14 +875,19 @@ bool SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) // #30576: To begin with test, if the conversion worked if( aL.pOUString != nullptr && aR.pOUString != nullptr ) { - *aL.pOUString += *aR.pOUString; + // tdf#108039: catch possible bad_alloc + try { + *aL.pOUString += *aR.pOUString; + } + catch (const std::bad_alloc&) { + SetError(ERRCODE_SBX_OVERFLOW); + } } // Not even Left OK? else if( aL.pOUString == nullptr ) { aL.pOUString = new OUString(); } - Put( aL ); } else SetError( ERRCODE_SBX_CONVERSION ); |