Skip to content

C
core
Kaydet (Commit) 155cc83a authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#735948 Dereference after null check 

Change-Id: I71ae6e3cc9aac46a16c377f5b46e141ee638835c
üst b2a2404e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sw/source/filter/ww8/ww8graf.cxx
Dosyayı görüntüle @ 155cc83a
......@@ -2110,12 +2110,12 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
if (!(pRecord->pXRelTo) && pFSPA)
{
pRecord->pXRelTo = new sal_uInt32;
*(pRecord->pXRelTo) = pFSPA->nbx;
*(pRecord->pXRelTo) = pFSPA->nbx;
}
if (!(pRecord->pYRelTo) && pFSPA)
{
pRecord->pYRelTo = new sal_uInt32;
*(pRecord->pYRelTo) = pFSPA->nby;
*(pRecord->pYRelTo) = pFSPA->nby;
}
// nXAlign - abs. Position, Left, Centered, Right, Inside, Outside
......@@ -2155,8 +2155,8 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
}
}
sal_uInt32 nXRelTo = nCntRelTo > *(pRecord->pXRelTo) ? *(pRecord->pXRelTo) : 1;
sal_uInt32 nYRelTo = nCntRelTo > *(pRecord->pYRelTo) ? *(pRecord->pYRelTo) : 1;
sal_uInt32 nXRelTo = (pRecord->pXRelTo && nCntRelTo > *(pRecord->pXRelTo)) ? *(pRecord->pXRelTo) : 1;
sal_uInt32 nYRelTo = (pRecord->pYRelTo && nCntRelTo > *(pRecord->pYRelTo)) ? *(pRecord->pYRelTo) : 1;
RndStdIds eAnchor = IsInlineEscherHack() ? FLY_AS_CHAR : FLY_AT_CHAR; // #i43718#
......
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