Changeset 73345 in webkit

Timestamp:

Dec 5, 2010 12:13:17 PM (13 years ago)

Author:

rwlbuis@webkit.org

Message:

2010-12-05 Rob Buis <​rwlbuis@gmail.com>

Reviewed by Nikolas Zimmermann.

createSVGTransformFromMatrix(undefined) => NULL ptr
​https://bugs.webkit.org/show_bug.cgi?id=49564

Throw TYPE_MISMATCH_ERR when using undefined or null as value for matrix parameter.

• svg/SVGTransformList.idl:
• svg/properties/SVGTransformListPropertyTearOff.h: (WebCore::SVGTransformListPropertyTearOff::createSVGTransformFromMatrix):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/dom/SVGTransformList-expected.txt (modified) (1 diff)
• LayoutTests/svg/dom/script-tests/SVGTransformList.js (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGTransformList.idl (modified) (1 diff)
• WebCore/svg/properties/SVGTransformListPropertyTearOff.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-05  Rob Buis  <rwlbuis@gmail.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        createSVGTransformFromMatrix(undefined) => NULL ptr
+        https://bugs.webkit.org/show_bug.cgi?id=49564
+
+        Extend existing test to make sure undefined or null as parameter
+        throw an exception.
+
+        * svg/dom/SVGTransformList-expected.txt:
+        * svg/dom/script-tests/SVGTransformList.js:
+
 2010-12-05  Robert Hogan  <robert@webkit.org>
 

trunk/LayoutTests/svg/dom/SVGTransformList-expected.txt

@@ -12 +12 @@
 PASS transform.createSVGTransformFromMatrix(1) threw exception TypeError: Type error.
 PASS transform.createSVGTransformFromMatrix(true) threw exception TypeError: Type error.
+PASS transform.createSVGTransformFromMatrix(undefined) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS transform.createSVGTransformFromMatrix(null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS successfullyParsed is true
 

trunk/LayoutTests/svg/dom/script-tests/SVGTransformList.js

@@ -13 +13 @@
 shouldThrow("transform.createSVGTransformFromMatrix(1)");
 shouldThrow("transform.createSVGTransformFromMatrix(true)");
+shouldThrow("transform.createSVGTransformFromMatrix(undefined)");
+shouldThrow("transform.createSVGTransformFromMatrix(null)");
 
 successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-05  Rob Buis  <rwlbuis@gmail.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        createSVGTransformFromMatrix(undefined) => NULL ptr
+        https://bugs.webkit.org/show_bug.cgi?id=49564
+
+        Throw TYPE_MISMATCH_ERR when using undefined or null as value for matrix parameter.
+
+        * svg/SVGTransformList.idl:
+        * svg/properties/SVGTransformListPropertyTearOff.h:
+        (WebCore::SVGTransformListPropertyTearOff::createSVGTransformFromMatrix):
+
 2010-12-05  Alejandro G. Castro  <alex@igalia.com>
 

trunk/WebCore/svg/SVGTransformList.idl

@@ -45 +45 @@
             raises(DOMException, SVGException);
 
-        [StrictTypeChecking, RequiresAllArguments=Raise] SVGTransform createSVGTransformFromMatrix(in SVGMatrix matrix);
+        [StrictTypeChecking, RequiresAllArguments=Raise] SVGTransform createSVGTransformFromMatrix(in SVGMatrix matrix)
+            raises(DOMException);
+
         SVGTransform consolidate()
             raises(DOMException);

trunk/WebCore/svg/properties/SVGTransformListPropertyTearOff.h

@@ -39 +39 @@
     }
 
-    PassRefPtr<SVGPropertyTearOff<SVGTransform> > createSVGTransformFromMatrix(SVGPropertyTearOff<SVGMatrix>* matrix)
+    PassRefPtr<SVGPropertyTearOff<SVGTransform> > createSVGTransformFromMatrix(SVGPropertyTearOff<SVGMatrix>* matrix, ExceptionCode& ec)
     {
-        ASSERT(matrix);
+        if (!matrix) {
+            ec = TYPE_MISMATCH_ERR;
+            return 0;
+        }
         SVGTransformList& values = m_animatedProperty->values();
         return SVGPropertyTearOff<SVGTransform>::create(values.createSVGTransformFromMatrix(matrix->propertyReference()));