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

[Caolán McNamara]

 filter/source/msfilter/msdffimp.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9d2857aecf635728f05beeff6f3c16a20e960509
Author: marc-andre at atc.tcs.com <marc-andre at atc.tcs.com>
Date:   Wed Jul 6 12:49:14 2011 +0530

    Added pointer validations to avoid some edge-case documents crashing
    (cherry picked from commit e3d3d88ccc959fc30d1d93bf1b6273f8d4f5b25a)

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index a1c55c7..d9df588 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4672,7 +4672,7 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r
                     aRecHd2.SeekToBegOfRecord( rSt );
                     sal_Int32 nShapeId;
                     SdrObject* pTmp = ImportGroup( aRecHd2, rSt, pClientData, aGroupClientAnchor, aGroupChildAnchor, nCalledByGroup + 1, &nShapeId );
-                    if ( pTmp )
+                    if ( pTmp && pRet && ((SdrObjGroup*)pRet)->GetSubList() )
                     {
                         ((SdrObjGroup*)pRet)->GetSubList()->NbcInsertObject( pTmp );
                         if( nShapeId )
@@ -4684,7 +4684,7 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r
                     aRecHd2.SeekToBegOfRecord( rSt );
                     sal_Int32 nShapeId;
                     SdrObject* pTmp = ImportShape( aRecHd2, rSt, pClientData, aClientRect, aGlobalChildRect, nCalledByGroup + 1, &nShapeId );
-                    if ( pTmp )
+                    if ( pTmp && pRet && ((SdrObjGroup*)pRet)->GetSubList())
                     {
                         ((SdrObjGroup*)pRet)->GetSubList()->NbcInsertObject( pTmp );
                         if( nShapeId )