diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-02 15:43:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-02 20:08:21 +0000 |
| commit | 155cc83a77eba659a99c3cab7c21e3cb0b8de647 (patch) | |
| tree | 8449fa90ef94c08d68451b2ef5321faad73449f8 /sw | |
| parent | b2a2404ef0dcfbda15e26d4dfd7397d96279bcde (diff) | |
coverity#735948 Dereference after null check
Change-Id: I71ae6e3cc9aac46a16c377f5b46e141ee638835c
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index ae10e905b9c1..84c51d18827b 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -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# |