[Libreoffice-commits] core.git: filter/source

Caolán McNamara caolanm at redhat.com
Tue Feb 14 10:39:06 UTC 2017


 filter/source/graphicfilter/iras/iras.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit aea7594bf1905c8a883b19f3191adb2488e05dd3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 14 10:38:29 2017 +0000

    check valid mnDstBitsPerPix before progressing
    
    Change-Id: I77b8e882b537ab10b26fa021ef633c603bbd6562

diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 3fb27e5..1cc6cd2 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -105,6 +105,13 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
     if ( !mbStatus )
         return false;
 
+    if (mnDstBitsPerPix != 1 &&
+        mnDstBitsPerPix != 8 &&
+        mnDstBitsPerPix != 24)
+    {
+        return false;
+    }
+
     bool bPalette(false);
     BitmapPalette aPalette;
 


More information about the Libreoffice-commits mailing list