Handle semicolons at end of keySplines value

Source/core/svg/SVGAnimationElement.cpp

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 60 matching lines @@
                 goto fail;
         }
         result.append(time);
     }
     return;
 fail:
     result.clear();
 }
 
 template<typename CharType>
-static void parseKeySplinesInternal(const String& string, Vector<UnitBezier>& result)
+static bool parseKeySplinesInternal(const String& string, Vector<UnitBezier>& result)
 {
     const CharType* ptr = string.getCharacters<CharType>();
     const CharType* end = ptr + string.length();
 
     skipOptionalSVGSpaces(ptr, end);
 
-    bool delimParsed = false;
     while (ptr < end) {
-        delimParsed = false;
         float posA = 0;
-        if (!parseNumber(ptr, end, posA)) {
-            result.clear();
-            return;
-        }
+        if (!parseNumber(ptr, end, posA))
+            return false;
 
         float posB = 0;
-        if (!parseNumber(ptr, end, posB)) {
-            result.clear();
-            return;
-        }
+        if (!parseNumber(ptr, end, posB))
+            return false;
 
         float posC = 0;
-        if (!parseNumber(ptr, end, posC)) {
-            result.clear();
-            return;
-        }
+        if (!parseNumber(ptr, end, posC))
+            return false;
 
         float posD = 0;
-        if (!parseNumber(ptr, end, posD, DisallowWhitespace)) {
-            result.clear();
-            return;
-        }
+        if (!parseNumber(ptr, end, posD, DisallowWhitespace))
+            return false;
 
         skipOptionalSVGSpaces(ptr, end);
 
-        if (ptr < end && *ptr == ';') {
-            delimParsed = true;
+        if (ptr < end && *ptr == ';')
             ptr++;
-        }
         skipOptionalSVGSpaces(ptr, end);
 
         result.append(UnitBezier(posA, posB, posC, posD));
     }
-    if (!(ptr == end && !delimParsed))
-        result.clear();
+
+    return ptr == end;
 }
 
-static void parseKeySplines(const String& string, Vector<UnitBezier>& result)
+static bool parseKeySplines(const String& string, Vector<UnitBezier>& result)
 {
     result.clear();
     if (string.isEmpty())
-        return;
+        return true;
     if (string.is8Bit())
-        parseKeySplinesInternal<LChar>(string, result);
+        return parseKeySplinesInternal<LChar>(string, result);
     else
-        parseKeySplinesInternal<UChar>(string, result);
+        return parseKeySplinesInternal<UChar>(string, result);
 }
 
 bool SVGAnimationElement::isSupportedAttribute(const QualifiedName& attrName)
 {
     DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
     if (supportedAttributes.isEmpty()) {
         supportedAttributes.add(SVGNames::valuesAttr);
         supportedAttributes.add(SVGNames::keyTimesAttr);
         supportedAttributes.add(SVGNames::keyPointsAttr);
         supportedAttributes.add(SVGNames::keySplinesAttr);
@@ skipping 33 matching lines @@
     if (name == SVGNames::keyPointsAttr) {
         if (isSVGAnimateMotionElement(*this)) {
             // This is specified to be an animateMotion attribute only but it is simpler to put it here
             // where the other timing calculatations are.
             parseKeyTimes(value, m_keyPoints, false);
         }
         return;
     }
 
     if (name == SVGNames::keySplinesAttr) {
-        parseKeySplines(value, m_keySplines);
+        if (!parseKeySplines(value, m_keySplines)) {
+            m_keySplines.clear();

[pdr., 2014/09/18 19:19:05]

Can you move the "m_keySplines.clear()" call into parseKeySplines? It will more
closely match the other parse* functions.

+            reportAttributeParsingError(ParsingAttributeFailedError, name, value);
+        }
         return;
     }
 
     if (name == SVGNames::attributeTypeAttr) {
         setAttributeType(value);
         return;
     }
 
     if (name == SVGNames::calcModeAttr) {
         setCalcMode(value);
@@ skipping 485 matching lines @@
     SVGSMILElement::setAttributeName(attributeName);
     checkInvalidCSSAttributeType(targetElement());
 }
 
 void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target)
 {
     m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attributeType() == AttributeTypeCSS && !isTargetAttributeCSSProperty(target, attributeName());
 }
 
 }