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

[Caolán McNamara]

 vcl/source/filter/ixpm/xpmread.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e02f068b9719c89d7aac1aaf4bb650160a3a3aed
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Nov 11 15:10:30 2017 +0000

    ofz: XPMReader::ImplGetColKey short read
    
    like
    
    commit 10a2388558df957b30136ba32ecc97ddef43fb57
    Date:   Tue Jan 17 12:35:24 2017 +0000
    
        ofz#411: XPMReader::ImplGetColKey short read
    
    Change-Id: Iffc7ddb00b2849b2f9fad17314086b87d3097660
    Reviewed-on: https://gerrit.libreoffice.org/44629
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index abda3b45cf11..d65844976d3c 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -406,6 +406,9 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey )
 {
     sal_uInt8 nTemp, nPrev = ' ';
 
+    if (mnStringSize < mnCpp + 1)
+        return false;
+
     mpPara = mpStringBuf + mnCpp + 1;
     mnParaSize = 0;