diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-24 14:22:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-24 15:48:51 +0000 |
| commit | c9126dfbabcde1bf8b157942a5f5134ad547b957 (patch) | |
| tree | 229d79081c2333626de3336fbbc1f719dcbc90f8 /sw | |
| parent | 6ceaec7396d3f8246fa104855eb10aff840d86c8 (diff) | |
&front may not be null in empty vector case, but that's not true here anyway
Change-Id: I6cd89c7e081dada7fb7a179ecd8aa65e98ed13a9
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 5e09ceed4168..02d98ec2d21a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1142,7 +1142,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, } sal_uInt32 nBufferSize = GetPropertyValue( DFF_Prop_pihlShape, 0 ); - if( (0 < nBufferSize) && (nBufferSize <= 0xFFFF) && SeekToContent( DFF_Prop_pihlShape, rSt ) ) + if( (0 < nBufferSize) && (nBufferSize <= 0xFFFF) && SeekToContent( DFF_Prop_pihlShape, rSt ) ) { SvMemoryStream aMemStream; struct HyperLinksTable hlStr; @@ -1151,15 +1151,13 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, // copy from DFF stream to memory stream std::vector< sal_uInt8 > aBuffer( nBufferSize ); - sal_uInt8* pnData = &aBuffer.front(); - sal_uInt8 nStreamSize; - if (pnData && rSt.ReadBytes(pnData, nBufferSize) == nBufferSize) + if (rSt.ReadBytes(aBuffer.data(), nBufferSize) == nBufferSize) { - aMemStream.WriteBytes(pnData, nBufferSize); + aMemStream.WriteBytes(aBuffer.data(), nBufferSize); aMemStream.Seek( STREAM_SEEK_TO_END ); - nStreamSize = aMemStream.Tell(); + sal_uInt8 nStreamSize = aMemStream.Tell(); aMemStream.Seek( STREAM_SEEK_TO_BEGIN ); - bool bRet = 4 <= nStreamSize; + bool bRet = 4 <= nStreamSize; if( bRet ) aMemStream.ReadUInt16( nRawRecId ).ReadUInt16( nRawRecSize ); SwDocShell* pDocShell = rReader.m_pDocShell; |