Bug 648819 - Stop ASSERTION: unknown nsISVGValue with invalid patternTransform. r=dholbert

2011-04-18 19:55:07 +01:00 · 2011-04-18 19:55:07 +01:00 · f00d0604ad
--- a/content/svg/content/src/nsSVGTransformList.cpp
+++ b/content/svg/content/src/nsSVGTransformList.cpp
@ -180,8 +180,7 @@ nsSVGTransformList::SetValueString(const nsAString& aValue)
  if (NS_FAILED(rv)) {
    // there was a parse error.
    rv = NS_ERROR_DOM_SYNTAX_ERR;
-  }
-  else {
+  } else {
    WillModify();
    ReleaseTransforms();
    PRInt32 count = xforms.Count();
@ -235,6 +234,9 @@ NS_IMETHODIMP nsSVGTransformList::GetNumberOfItems(PRUint32 *aNumberOfItems)
 /* void clear (); */
 NS_IMETHODIMP nsSVGTransformList::Clear()
 {
+  if (mTransforms.IsEmpty()) {
+    return NS_OK;
+  }
  WillModify();
  ReleaseTransforms();
  DidModify();
--- a/layout/svg/crashtests/648819-1.html
+++ b/layout/svg/crashtests/648819-1.html
@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<script>
+var p = document.createElementNS("http://www.w3.org/2000/svg", "pattern");
+p.setAttribute("patternTransform", "i");
+p.patternTransform.baseVal.clear();
+</script>
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@ -105,3 +105,4 @@ load 612662-2.svg
 load 614367-1.svg
 load 620034-1.html
 load 621598-1.svg
+load 648819-1.html