[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - vcl/source

[Caolán McNamara]

 vcl/source/filter/wmf/winmtf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4d655e2df4831ab76d98d5ba8a8dc199d7bb44e4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 21 17:13:47 2017 +0000

    ofz#439 protect against 0 len text
    
    Change-Id: Ib67284636235b0d43df626a4aeed67f2bc64b491
    Reviewed-on: https://gerrit.libreoffice.org/33375
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit 033b47dd2ace4d43bf0be1a6983717adf044b0c2)
    Reviewed-on: https://gerrit.libreoffice.org/33535
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 36aae28..6bc8b7d 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1457,9 +1457,9 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, long* pDXArry, b
         sal_Int32 nTextWidth;
         pVDev->SetMapMode( MapMode( MapUnit::Map100thMM ) );
         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 ];