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

[Caolán McNamara]

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

New commits:
commit 864e59042bf4475428e182aa93256aaef2ac4e2e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 9 09:05:12 2017 +0000

    ofz#394 xbm ParseDefine problem
    
    Change-Id: I75fb761d23fdb3780088a9d209200429edb57a26
    Reviewed-on: https://gerrit.libreoffice.org/32878
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index a8a59a7..96e7ae3 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -174,11 +174,11 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
     cTmp = *pTmp--;
 
     // search last digit
-    while( pHexTable[ cTmp ] == -1 )
+    while (pHexTable[ cTmp ] == -1 && pTmp >= pDefine)
         cTmp = *pTmp--;
 
     // move before number
-    while( pHexTable[ cTmp ] != -1 )
+    while (pHexTable[ cTmp ] != -1 && pTmp >= pDefine)
         cTmp = *pTmp--;
 
     // move to start of number