diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-22 11:09:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-22 11:10:05 +0000 |
| commit | 3ea598f65bed096dbf4bda5fe4105b57c58b5310 (patch) | |
| tree | 2ab9200a3f14e8ffc6cc46dc17904a138c0540d7 /vcl | |
| parent | 3bff2da31ed580817f6b5b653f48727e38078af5 (diff) | |
valgrind: stick 0 at end of successfully read data
Change-Id: Id79f68c9095ab313ac05d2c8b55df71788df81d3
(cherry picked from commit 0dfc6f70ab53a773ee05664235d7c8927ab20f2c)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/wmf/winwmf.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 1544def60881..ce836587648a 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -886,7 +886,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; @@ -904,7 +903,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; |