mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

valgrind: stick 0 at end of successfully read data

Browse Source 
Change-Id: Id79f68c9095ab313ac05d2c8b55df71788df81d3
This commit is contained in:
Caolán McNamara
2016-12-22 11:09:08 +00:00
parent b08e481663
commit 0dfc6f70ab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/source/filter/wmf/winwmf.cxx
View File

@@ -884,7 +884,6 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
{ {
Size aFontSize; Size aFontSize;
char lfFaceName[LF_FACESIZE+1]; char lfFaceName[LF_FACESIZE+1];
lfFaceName[LF_FACESIZE] = 0;
sal_Int16 lfEscapement = 0; sal_Int16 lfEscapement = 0;
sal_Int16 lfOrientation = 0; sal_Int16 lfOrientation = 0;
sal_Int16 lfWeight = 0; sal_Int16 lfWeight = 0;
@@ -902,7 +901,8 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
pWMF->ReadUChar( aLogFont.lfClipPrecision ); pWMF->ReadUChar( aLogFont.lfClipPrecision );
pWMF->ReadUChar( aLogFont.lfQuality ); pWMF->ReadUChar( aLogFont.lfQuality );
pWMF->ReadUChar( aLogFont.lfPitchAndFamily ); pWMF->ReadUChar( aLogFont.lfPitchAndFamily );
pWMF->ReadBytes( lfFaceName, LF_FACESIZE ); size_t nRet = pWMF->ReadBytes( lfFaceName, LF_FACESIZE );
lfFaceName[nRet] = 0;
aLogFont.lfWidth = aFontSize.Width(); aLogFont.lfWidth = aFontSize.Width();
aLogFont.lfHeight = aFontSize.Height(); aLogFont.lfHeight = aFontSize.Height();
aLogFont.lfEscapement = lfEscapement; aLogFont.lfEscapement = lfEscapement;