[Libreoffice-commits] .: Branch 'libreoffice-3-3' - filter/source

[Thorsten Behrens]

 filter/source/msfilter/msvbasic.cxx |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 39d45e8899421d247c3d7042231d6898d058aaf1
Author: Noel Power <noel.power at novell.com>
Date:   Mon Jan 10 15:26:47 2011 +0000

    fdo#32600# fix specific core dump on read
    
    Seems like the REFERENCENAME record has some optional parts ( when Reserved is not eh expected 0x003E ) Ultimately thow we should get rid of filter/source/msfilter/msvbasic.cxx in favour of the oox filter.
    (cherry picked from commit 3dafb0e3f67b676169238b565890d88258377eb4)
    
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>

diff --git a/filter/source/msfilter/msvbasic.cxx b/filter/source/msfilter/msvbasic.cxx
index 41f4f5e..a36def5 100644
--- a/filter/source/msfilter/msvbasic.cxx
+++ b/filter/source/msfilter/msvbasic.cxx
@@ -435,7 +435,8 @@ ReferenceNameRecord() : Id( 0x16 ), SizeOfName( 0 ), Reserved( 0x3E ), SizeOfNam
 
 void read( SvStream* pStream )
 {
-    OSL_TRACE("NameRecord [0x%x]", pStream->Tell() );
+    long nPos =  pStream->Tell();
+    OSL_TRACE("NameRecord [0x%x]", nPos );
     *pStream >> Id >> SizeOfName;
  
     boost::scoped_array< sal_uInt8 > pName( new sal_uInt8[ SizeOfName ] );
@@ -443,7 +444,19 @@ void read( SvStream* pStream )
     pStream->Read( pName.get(), SizeOfName );
     Name = svt::BinFilterUtils::CreateOUStringFromStringArray( reinterpret_cast< const char* >( pName.get() ), SizeOfName );
 
-    *pStream >> Reserved >> SizeOfNameUnicode;
+    nPos =  pStream->Tell();
+    *pStream >> Reserved;
+
+    if ( Reserved != 0x3E )
+    {
+        // it seems the spec here is incorrect and the Unicode portion
+        // looks like it can be optional ( if 'Reserved' isn't the expected
+        // 0x34 ) - return stream here to point before Reserved
+        pStream->Seek( nPos );
+        return;
+    }
+
+    *pStream >> SizeOfNameUnicode;
 
     boost::scoped_array< sal_uInt8 > pNameUnicode( new sal_uInt8[ SizeOfNameUnicode ] );
     pStream->Read( pNameUnicode.get(), SizeOfNameUnicode );