Kaydet (Commit) a96014f1 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#123163 avoid null deref

one RemoveDrawObjFromPage is already null-deref protected,
do the same for the other

Change-Id: Ica5bb2df4a8dbffd8397df76b673adab75bb7aef
Reviewed-on: https://gerrit.libreoffice.org/67452
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 1ae50279
...@@ -2540,7 +2540,8 @@ static void lcl_RemoveObjsFromPage( SwFrame* _pFrame ) ...@@ -2540,7 +2540,8 @@ static void lcl_RemoveObjsFromPage( SwFrame* _pFrame )
{ {
if (pObj->GetFrameFormat().GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR) if (pObj->GetFrameFormat().GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR)
{ {
pObj->GetPageFrame()->RemoveDrawObjFromPage( if (SwPageFrame *pPg = pObj->GetPageFrame())
pPg->RemoveDrawObjFromPage(
*static_cast<SwAnchoredDrawObject*>(pObj) ); *static_cast<SwAnchoredDrawObject*>(pObj) );
} }
} }
...@@ -2881,8 +2882,8 @@ static void lcl_Regist( SwPageFrame *pPage, const SwFrame *pAnch ) ...@@ -2881,8 +2882,8 @@ static void lcl_Regist( SwPageFrame *pPage, const SwFrame *pAnch )
if ( pPage != pObj->GetPageFrame() ) if ( pPage != pObj->GetPageFrame() )
{ {
// #i28701# // #i28701#
if ( pObj->GetPageFrame() ) if (SwPageFrame *pPg = pObj->GetPageFrame())
pObj->GetPageFrame()->RemoveDrawObjFromPage( *pObj ); pPg->RemoveDrawObjFromPage( *pObj );
pPage->AppendDrawObjToPage( *pObj ); pPage->AppendDrawObjToPage( *pObj );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment