diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-13 13:01:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-04-13 19:29:05 +0200 |
| commit | d180418fedd4592044c33558426e9ea9be6f1ebd (patch) | |
| tree | b0e1cb1dec03607d84b66dbc15453d98072bedc1 | |
| parent | 42bf09876a8cb7faef0c2490ff3e7531de4fec8f (diff) | |
ofz: header has to be at least 1 pair long
Change-Id: I5725048519a2b68265e90d12b1e4bcb506c56fc2
(cherry picked from commit e72f3ce68e18ac604469ce5e856341a469af27ff)
Reviewed-on: https://gerrit.libreoffice.org/36519
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 09e6dfd3f893..718faff1c16c 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1246,12 +1246,20 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet) return nullptr; sal_uInt16 nCount = SVBT16ToShort( aCallB.dpPolyLine.aBits1 ) >> 1 & 0x7fff; + if (nCount < 1) + { + SAL_WARN("sw.ww8", "Short CaptionBox header"); + return nullptr; + } + std::unique_ptr<SVBT16[]> xP(new SVBT16[nCount * 2]); bool bCouldRead = checkRead(*m_pStrm, xP.get(), nCount * 4); // Punkte einlesen - OSL_ENSURE(bCouldRead, "Short CaptionBox header"); if (!bCouldRead) + { + SAL_WARN("sw.ww8", "Short CaptionBox header"); return nullptr; + } sal_uInt8 nTyp = (sal_uInt8)nCount - 1; if( nTyp == 1 && SVBT16ToShort( xP[0] ) == SVBT16ToShort( xP[2] ) ) |