[webkit-changes] cvs commit: WebCore/kcanvas/device/quartz KCanvasFilterQuartz.mm

[Eric]

eseidel     06/01/06 18:15:16

  Modified:    .        ChangeLog
               kcanvas/device/quartz KCanvasFilterQuartz.mm
  Log:
  Bug #: 4386652
  Submitted by: eseidel
  Reviewed by: darin
          <rdar://problem/4386652> Crash: SVG filter crash at w3schools.com
  
          * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
          (KCanvasFEDiffuseLightingQuartz::getCIFilter): nil check
          (KCanvasFESpecularLightingQuartz::getCIFilter): nil check
  
  Revision  Changes    Path
  1.96      +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- ChangeLog	6 Jan 2006 19:24:03 -0000	1.95
  +++ ChangeLog	7 Jan 2006 02:15:15 -0000	1.96
  @@ -1,3 +1,13 @@
  +2006-01-06  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by darin.
  +
  +        <rdar://problem/4386652> Crash: SVG filter crash at w3schools.com
  +
  +        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
  +        (KCanvasFEDiffuseLightingQuartz::getCIFilter): nil check
  +        (KCanvasFESpecularLightingQuartz::getCIFilter): nil check
  +
   2006-01-06  Geoffrey Garen  <ggaren at apple.com>
   
           Patch by Mitz, reviwed by Darin, layout tested and landed by me.
  
  
  
  1.24      +6 -2      WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
  
  Index: KCanvasFilterQuartz.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- KCanvasFilterQuartz.mm	4 Jan 2006 08:20:24 -0000	1.23
  +++ KCanvasFilterQuartz.mm	7 Jan 2006 02:15:15 -0000	1.24
  @@ -507,7 +507,9 @@
           return nil;
       
       [filter setDefaults];
  -    CIFilter *normals = getNormalMap(quartzFilter->inputImage(this), surfaceScale());
  +    CIImage *inputImage = quartzFilter->inputImage(this);
  +    FE_QUARTZ_CHECK_INPUT(inputImage);
  +    CIFilter *normals = getNormalMap(inputImage, surfaceScale());
       if (!normals) 
           return nil;
       
  @@ -636,7 +638,9 @@
       KWQ_BLOCK_EXCEPTIONS;
       filter = [CIFilter filterWithName:@"WKSpecularLighting"];
       [filter setDefaults];
  -    CIFilter *normals = getNormalMap(quartzFilter->inputImage(this), surfaceScale());
  +    CIImage *inputImage = quartzFilter->inputImage(this);
  +    FE_QUARTZ_CHECK_INPUT(inputImage);
  +    CIFilter *normals = getNormalMap(inputImage, surfaceScale());
       if (!normals) 
           return nil;
       CIFilter *lightVectors = getLightVectors(normals, light, surfaceScale());