Use a local variable as a character cursor in genericParseNumber

third_party/WebKit/Source/core/svg/SVGParserUtilities.cpp

 /*
  * Copyright (C) 2002, 2003 The Karbon Developers
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007, 2009, 2013 Apple Inc. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 20 matching lines @@
 static inline bool isValidRange(const FloatType& x)
 {
     static const FloatType max = std::numeric_limits<FloatType>::max();
     return x >= -max && x <= max;
 }
 
 // We use this generic parseNumber function to allow the Path parsing code to work
 // at a higher precision internally, without any unnecessary runtime cost or code
 // complexity.
 template <typename CharType, typename FloatType>
-static bool genericParseNumber(const CharType*& ptr, const CharType* end, FloatType& number, WhitespaceMode mode)
+static bool genericParseNumber(const CharType*& cursor, const CharType* end, FloatType& number, WhitespaceMode mode)
 {
     FloatType integer, decimal, frac, exponent;
     int sign, expsign;
 
     exponent = 0;
     integer = 0;
     frac = 1;
     decimal = 0;
     sign = 1;
     expsign = 1;
 
     if (mode & AllowLeadingWhitespace)
-        skipOptionalSVGSpaces(ptr, end);
+        skipOptionalSVGSpaces(cursor, end);
 
+    const CharType* ptr = cursor;
     // read the sign
     if (ptr < end && *ptr == '+')
         ptr++;
     else if (ptr < end && *ptr == '-') {
         ptr++;
         sign = -1;
     }
 
     if (ptr == end || ((*ptr < '0' || *ptr > '9') && *ptr != '.'))
         // The first character of a number must be one of [0-9+-.]
@@ skipping 61 matching lines @@
     number = integer + decimal;
     number *= sign;
 
     if (exponent)
         number *= static_cast<FloatType>(pow(10.0, expsign * static_cast<int>(exponent)));
 
     // Don't return Infinity() or NaN().
     if (!isValidRange(number))
         return false;
 
+    // A valid number has been parsed. Commit cursor.
+    cursor = ptr;
+
     if (mode & AllowTrailingWhitespace)
-        skipOptionalSVGSpacesOrDelimiter(ptr, end);
+        skipOptionalSVGSpacesOrDelimiter(cursor, end);
 
     return true;
 }
 
 bool parseNumber(const LChar*& ptr, const LChar* end, float& number, WhitespaceMode mode)
 {
     return genericParseNumber(ptr, end, number, mode);
 }
 
 bool parseNumber(const UChar*& ptr, const UChar* end, float& number, WhitespaceMode mode)
@@ skipping 91 matching lines @@
         const LChar* ptr = string.characters8();
         const LChar* end = ptr + string.length();
         return genericParseNumberOrPercentage(ptr, end, number);
     }
     const UChar* ptr = string.characters16();
     const UChar* end = ptr + string.length();
     return genericParseNumberOrPercentage(ptr, end, number);
 }
 
 }