[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.0.3-CVS-2008-1670.patch

[Ingmar Vanhassel (ingmar)]

ingmar      08/04/28 14:10:32

  Added:                kdelibs-4.0.3-CVS-2008-1670.patch
  Log:
  Fix security bug 218848, CVS-2008-1670.
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.1                  kde-base/kdelibs/files/kdelibs-4.0.3-CVS-2008-1670.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.0.3-CVS-2008-1670.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.0.3-CVS-2008-1670.patch?rev=1.1&content-type=text/plain

Index: kdelibs-4.0.3-CVS-2008-1670.patch
===================================================================
--- khtml/imload/decoders/pngloader.cpp
+++ khtml/imload/decoders/pngloader.cpp
@@ -109,6 +109,8 @@ private:
             
             if (colorType == PNG_COLOR_TYPE_RGB)
                 colorType =  PNG_COLOR_TYPE_RGB_ALPHA; //Paranoia..
+            else if (colorType == PNG_COLOR_TYPE_GRAY)
+                colorType = PNG_COLOR_TYPE_GRAY_ALPHA;
         }    
             
         ImageFormat imFrm;    
@@ -192,6 +194,7 @@ private:
     {
         if (interlaced)
         {
+            Q_ASSERT(pngReadStruct->row_info.pixel_depth <= depth * 8);
             requestScanline(rowNum, scanlineBuf);
             png_progressive_combine_row(pngReadStruct, scanlineBuf, data);
             notifyScanline(pass + 1, scanlineBuf);



-- 
gentoo-commits@l.g.o mailing list