Changeset 224089 in webkit

Timestamp:

Oct 27, 2017 12:11:56 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

WebDriver: deserializeTimeouts should fail if the value is not integer
​https://bugs.webkit.org/show_bug.cgi?id=178866

Reviewed by Brian Burg.

If value is not an integer, or it is less than 0 or greater than 2^{64 – 1, return error with error code invalid
argument.
​https://w3c.github.io/webdriver/webdriver-spec.html#dfn-deserialize-as-a-timeout}

Fixes: imported/w3c/webdriver/tests/sessions/new_session/invalid_capabilities.py::test_invalid_values[timeouts-value59-body0]

imported/w3c/webdriver/tests/sessions/new_session/invalid_capabilities.py::test_invalid_values[timeouts-value59-body1]

• WebDriverService.cpp:

(WebDriver::deserializeTimeouts):

Location:

trunk/Source/WebDriver

Files:

• ChangeLog (modified) (1 diff)
• WebDriverService.cpp (modified) (1 diff)

trunk/Source/WebDriver/ChangeLog

@@ +1 @@
+2017-10-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: deserializeTimeouts should fail if the value is not integer
+        https://bugs.webkit.org/show_bug.cgi?id=178866
+
+        Reviewed by Brian Burg.
+
+        If value is not an integer, or it is less than 0 or greater than 2^64 – 1, return error with error code invalid
+        argument.
+        https://w3c.github.io/webdriver/webdriver-spec.html#dfn-deserialize-as-a-timeout
+
+        Fixes: imported/w3c/webdriver/tests/sessions/new_session/invalid_capabilities.py::test_invalid_values[timeouts-value59-body0]
+               imported/w3c/webdriver/tests/sessions/new_session/invalid_capabilities.py::test_invalid_values[timeouts-value59-body1]
+
+        * WebDriverService.cpp:
+        (WebDriver::deserializeTimeouts):
+
 2017-10-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebDriver/WebDriverService.cpp

@@ -284 +284 @@
 
         int timeoutMS;
-        if (!it->value->asInteger(timeoutMS) || timeoutMS < 0 || timeoutMS > INT_MAX)
+        if (it->value->type() != InspectorValue::Type::Integer || !it->value->asInteger(timeoutMS) || timeoutMS < 0 || timeoutMS > INT_MAX)
             return std::nullopt;