Title: [224105] releases/WebKitGTK/webkit-2.18/Source/WebDriver
- Revision
- 224105
- Author
- [email protected]
- Date
- 2017-10-27 02:31:09 -0700 (Fri, 27 Oct 2017)
Log Message
Merge r224089 - 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebDriver/ChangeLog (224104 => 224105)
--- releases/WebKitGTK/webkit-2.18/Source/WebDriver/ChangeLog 2017-10-27 09:31:04 UTC (rev 224104)
+++ releases/WebKitGTK/webkit-2.18/Source/WebDriver/ChangeLog 2017-10-27 09:31:09 UTC (rev 224105)
@@ -1,5 +1,22 @@
2017-10-27 Carlos Garcia Campos <[email protected]>
+ 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 <[email protected]>
+
WebDriver: failing to process capabilities should produce InvalidArgument error not SessionNotCreated
https://bugs.webkit.org/show_bug.cgi?id=178864
Modified: releases/WebKitGTK/webkit-2.18/Source/WebDriver/WebDriverService.cpp (224104 => 224105)
--- releases/WebKitGTK/webkit-2.18/Source/WebDriver/WebDriverService.cpp 2017-10-27 09:31:04 UTC (rev 224104)
+++ releases/WebKitGTK/webkit-2.18/Source/WebDriver/WebDriverService.cpp 2017-10-27 09:31:09 UTC (rev 224105)
@@ -283,7 +283,7 @@
continue;
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;
if (it->key == "script")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
