From 375b01bf747bb206c3fd6bad0acbd38271a8fb86 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 13 May 2014 05:22:47 +0200 Subject: [PATCH] i#64348 basic: fix CDec() crash if string is empty Change-Id: I92e9472e14c00a6550081f0d58a352faa5b78b98 --- basic/source/sbx/sbxdec.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx index 59f5e015a737..f0cab347e512 100644 --- a/basic/source/sbx/sbxdec.cxx +++ b/basic/source/sbx/sbxdec.cxx @@ -194,6 +194,8 @@ void SbxDecimal::setUInt( unsigned int val ) bool SbxDecimal::setString( OUString* pOUString ) { + assert(pOUString); + static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); // Convert delimiter @@ -471,7 +473,11 @@ start: case SbxLPSTR: case SbxSTRING: case SbxBYREF | SbxSTRING: - pnDecRes->setString( p->pOUString ); break; + if( !p->pOUString ) + pnDecRes->setString( new OUString ); + else + pnDecRes->setString( p->pOUString ); + break; case SbxOBJECT: { SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);