diff options
| author | marc-andre@atc.tcs.com <marc-andre@atc.tcs.com> | 2011-07-06 12:49:14 +0530 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-06 09:21:46 +0100 |
| commit | e3d3d88ccc959fc30d1d93bf1b6273f8d4f5b25a (patch) | |
| tree | 557b4a0c5318ff1980b6f5f4cac69b94d85cc61b | |
| parent | da86f09d6b1792d3d91b53cd0e117c88137883b1 (diff) | |
Added pointer validations to avoid some edge-case documents crashing
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 0f37e992e..cbd1b2373 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4663,7 +4663,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 ) @@ -4675,7 +4675,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 ) |