From 019e6ae7be38176978943d95fa3b586830e1b3b1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 11 Nov 2017 15:10:30 +0000
Subject: ofz: XPMReader::ImplGetColKey short read
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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/44628
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 vcl/source/filter/ixpm/xpmread.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'vcl/source')

diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index 9d6e8d14b42d..bb89e7a5e647 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;
 
-- 
cgit v1.2.3