vcl/source/filter/wmf/winwmf.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0dfc6f70ab53a773ee05664235d7c8927ab20f2c
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Dec 22 11:09:08 2016 +0000
valgrind: stick 0 at end of successfully read data
Change-Id: Id79f68c9095ab313ac05d2c8b55df71788df81d3
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 33a53a3..72a726a 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -884,7 +884,6 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
{
Size aFontSize;
char lfFaceName[LF_FACESIZE+1];
- lfFaceName[LF_FACESIZE] = 0;
sal_Int16 lfEscapement = 0;
sal_Int16 lfOrientation = 0;
sal_Int16 lfWeight = 0;
@@ -902,7 +901,8 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
pWMF->ReadUChar( aLogFont.lfClipPrecision );
pWMF->ReadUChar( aLogFont.lfQuality );
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.lfHeight = aFontSize.Height();
aLogFont.lfEscapement = lfEscapement;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
