[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - basic/source

[Thomas Arnhold]

 basic/source/sbx/sbxdec.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d5af7aa995d5cea88649447d9828cca4b21b6596
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue May 13 05:22:47 2014 +0200

    i#64348 basic: fix CDec() crash if string is empty
    
    Change-Id: I92e9472e14c00a6550081f0d58a352faa5b78b98
    Reviewed-on: https://gerrit.libreoffice.org/9336
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 276b788..25d7936 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
@@ -472,7 +474,9 @@ start:
         case SbxLPSTR:
         case SbxSTRING:
         case SbxBYREF | SbxSTRING:
-            pnDecRes->setString( p->pOUString ); break;
+            if( p->pOUString )
+                pnDecRes->setString( p->pOUString );
+            break;
         case SbxOBJECT:
         {
             SbxValue* pVal = PTR_CAST(SbxValue,p->pObj);