diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-21 17:13:47 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-01-26 13:59:00 +0000 |
| commit | 4f8205659a810e4f89ff1fc0148393aefec53f97 (patch) | |
| tree | cc33481abc6827996c345a74cab199b7efdd6b35 /vcl | |
| parent | 0f3c645a8f6662aff1d96307b905f5309079bddc (diff) | |
ofz#439 protect against 0 len text
Change-Id: Ib67284636235b0d43df626a4aeed67f2bc64b491
Reviewed-on: https://gerrit.libreoffice.org/33376
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 2228bbcee734..09b0521fca0b 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -1442,9 +1442,9 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, long* pDXArry, b sal_Int32 nTextWidth; pVDev->SetMapMode( MapMode( MAP_100TH_MM ) ); pVDev->SetFont( maFont ); - if( pDXArry ) + const sal_uInt32 nLen = pDXArry ? rText.getLength() : 0; + if (nLen) { - sal_uInt32 nLen = rText.getLength(); nTextWidth = pVDev->GetTextWidth( OUString(rText[ nLen - 1 ]) ); if( nLen > 1 ) nTextWidth += pDXArry[ nLen - 2 ]; |