WebCrypto: properly normalize optional numeric parameters.

Source/modules/crypto/NormalizeAlgorithm.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 217 matching lines @@
 
 bool getUint8Array(const Dictionary& raw, const char* propertyName, RefPtr<Uint8Array>& array, const ExceptionContext& context, ExceptionState& es)
 {
     if (!raw.get(propertyName, array) || !array) {
         es.throwTypeError(context.toString(propertyName, "Missing or not a Uint8Array"));
         return false;
     }
     return true;
 }
 
+// Gets an integer according to WebIDL's [EnforceRange].
 bool getInteger(const Dictionary& raw, const char* propertyName, double& value, double minValue, double maxValue, const ExceptionContext& context, ExceptionState& es)
 {
     double number;
     if (!raw.get(propertyName, number)) {
         es.throwTypeError(context.toString(propertyName, "Missing or not a number"));
         return false;
     }
 
-    // Convert to an integer according to WebIDL's [EnforceRange].
-    if (std::isinf(number) || std::isnan(number)) {
+    if (std::isnan(number)) {
+        es.throwTypeError(context.toString(propertyName, "Is not a number"));
+        return false;
+    }
+    if (std::isinf(number)) {
         es.throwTypeError(context.toString(propertyName, "Outside of numeric range"));
         return false;
     }
 
     number = trunc(number);
 
     if (number < minValue || number > maxValue) {
         es.throwTypeError(context.toString(propertyName, "Outside of numeric range"));
         return false;
     }
 
     value = number;
     return true;
 }
 
-bool getOptionalInteger(const Dictionary& raw, const char* propertyName, bool& hasValue, double& value, double minValue, double maxValue, const ExceptionContext& context, ExceptionState& es)
-{
-    double number;
-    if (!raw.get(propertyName, number)) {
-        // FIXME: If the property exists but is NOT a number, should fail.
-        hasValue = false;
-        return true;
-    }
-
-    hasValue = true;
-    return getInteger(raw, propertyName, value, minValue, maxValue, context, es);
-}
-
 bool getUint32(const Dictionary& raw, const char* propertyName, uint32_t& value, const ExceptionContext& context, ExceptionState& es)
 {
     double number;
     if (!getInteger(raw, propertyName, number, 0, 0xFFFFFFFF, context, es))
         return false;
     value = number;
     return true;
 }
 
 bool getUint16(const Dictionary& raw, const char* propertyName, uint16_t& value, const ExceptionContext& context, ExceptionState& es)
 {
     double number;
     if (!getInteger(raw, propertyName, number, 0, 0xFFFF, context, es))
         return false;
     value = number;
     return true;
 }
 
-bool getOptionalUint32(const Dictionary& raw, const char* propertyName, bool& hasValue, uint32_t& value, const ExceptionContext& context, ExceptionState& es)
-{
-    double number;
-    if (!getOptionalInteger(raw, propertyName, hasValue, number, 0, 0xFFFFFFFF, context, es))
-        return false;
-    if (hasValue)
-        value = number;
-    return true;
-}
-
 bool parseAesCbcParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es)
 {
     RefPtr<ArrayBufferView> iv;
     if (!getArrayBufferView(raw, "iv", iv, context, es))
         return false;
 
     if (iv->byteLength() != 16) {
         es.throwTypeError(context.toString("iv", "Must be 16 bytes"));
         return false;
     }
@@ skipping 35 matching lines @@
     params = adoptPtr(new WebKit::WebCryptoHmacParams(hash));
     return true;
 }
 
 bool parseHmacKeyParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es)
 {
     WebKit::WebCryptoAlgorithm hash;
     if (!parseHash(raw, hash, context, es))
         return false;
 
-    bool hasLength;
-    uint32_t length;
-    if (!getOptionalUint32(raw, "length", hasLength, length, context, es))
+    bool hasLength = raw.hasValue("length");
+    uint32_t length = 0;
+    if (hasLength && !getUint32(raw, "length", length, context, es))
         return false;
 
     params = adoptPtr(new WebKit::WebCryptoHmacKeyParams(hash, hasLength, length));
     return true;
 }
 
 bool parseRsaSsaParams(const Dictionary& raw, OwnPtr<WebKit::WebCryptoAlgorithmParams>& params, const ExceptionContext& context, ExceptionState& es)
 {
     WebKit::WebCryptoAlgorithm hash;
     if (!parseHash(raw, hash, context, es))
@@ skipping 94 matching lines @@
 }
 
 } // namespace
 
 bool normalizeAlgorithm(const Dictionary& raw, AlgorithmOperation op, WebKit::WebCryptoAlgorithm& algorithm, ExceptionState& es)
 {
     return normalizeAlgorithm(raw, op, algorithm, ExceptionContext(), es);
 }
 
 } // namespace WebCore