[webkit-changes] [242544] releases/WebKitGTK/webkit-2.24/Source/WebDriver

Wed, 06 Mar 2019 05:31:26 -0800

Title: [242544] releases/WebKitGTK/webkit-2.24/Source/WebDriver
Revision
242544
Author
[email protected]
Date
2019-03-06 05:30:42 -0800 (Wed, 06 Mar 2019)

Log Message

Merge r242352 - WebDriver: fix String not terminated with null caracter
https://bugs.webkit.org/show_bug.cgi?id=195274

Patch by Karl Leplat <[email protected]> on 2019-03-04
Reviewed by Carlos Garcia Campos.

This has been detected by an exception returned by the function
evaluateJavaScriptFunction with the message :
[native code]: JS ERROR SyntaxError: Unexpected keyword 'function'. Expected ')' to end a compound _expression_.
keyword 'function' has been initialized with a string that come from char array, not a null-terminated string.

* Session.cpp:
(WebDriver::Session::fullscreenWindow):
(WebDriver::Session::findElements):
(WebDriver::Session::isElementSelected):
(WebDriver::Session::isElementDisplayed):
(WebDriver::Session::getElementAttribute):
(WebDriver::Session::elementClear):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.24/Source/WebDriver/ChangeLog (242543 => 242544)


--- releases/WebKitGTK/webkit-2.24/Source/WebDriver/ChangeLog	2019-03-06 13:30:40 UTC (rev 242543)
+++ releases/WebKitGTK/webkit-2.24/Source/WebDriver/ChangeLog	2019-03-06 13:30:42 UTC (rev 242544)
@@ -1,3 +1,23 @@
+2019-03-04  Karl Leplat  <[email protected]>
+
+        WebDriver: fix String not terminated with null caracter
+        https://bugs.webkit.org/show_bug.cgi?id=195274
+
+        Reviewed by Carlos Garcia Campos.
+
+        This has been detected by an exception returned by the function
+        evaluateJavaScriptFunction with the message :
+        [native code]: JS ERROR SyntaxError: Unexpected keyword 'function'. Expected ')' to end a compound _expression_.
+        keyword 'function' has been initialized with a string that come from char array, not a null-terminated string.
+
+        * Session.cpp:
+        (WebDriver::Session::fullscreenWindow):
+        (WebDriver::Session::findElements):
+        (WebDriver::Session::isElementSelected):
+        (WebDriver::Session::isElementDisplayed):
+        (WebDriver::Session::getElementAttribute):
+        (WebDriver::Session::elementClear):
+
 2019-01-31  Zan Dobersek  <[email protected]>
 
         Unreviewed speculative WPE build fix.

Modified: releases/WebKitGTK/webkit-2.24/Source/WebDriver/Session.cpp (242543 => 242544)


--- releases/WebKitGTK/webkit-2.24/Source/WebDriver/Session.cpp	2019-03-06 13:30:40 UTC (rev 242543)
+++ releases/WebKitGTK/webkit-2.24/Source/WebDriver/Session.cpp	2019-03-06 13:30:42 UTC (rev 242544)
@@ -839,7 +839,7 @@
 
         RefPtr<JSON::Object> parameters = JSON::Object::create();
         parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value());
-        parameters->setString("function"_s, EnterFullscreenJavaScript);
+        parameters->setString("function"_s, String(EnterFullscreenJavaScript, sizeof(EnterFullscreenJavaScript)));
         parameters->setArray("arguments"_s, JSON::Array::create());
         parameters->setBoolean("expectsImplicitCallbackArgument"_s, true);
         m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [this, protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) mutable {
@@ -1002,7 +1002,7 @@
         parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value());
         if (m_currentBrowsingContext)
             parameters->setString("frameHandle"_s, m_currentBrowsingContext.value());
-        parameters->setString("function"_s, FindNodesJavaScript);
+        parameters->setString("function"_s, String(FindNodesJavaScript, sizeof(FindNodesJavaScript)));
         parameters->setArray("arguments"_s, WTFMove(arguments));
         parameters->setBoolean("expectsImplicitCallbackArgument"_s, true);
         // If there's an implicit wait, use one second more as callback timeout.
@@ -1116,7 +1116,7 @@
         parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value());
         if (m_currentBrowsingContext)
             parameters->setString("frameHandle"_s, m_currentBrowsingContext.value());
-        parameters->setString("function"_s, ElementAttributeJavaScript);
+        parameters->setString("function"_s, String(ElementAttributeJavaScript, sizeof(ElementAttributeJavaScript)));
         parameters->setArray("arguments"_s, WTFMove(arguments));
         m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {
             if (response.isError || !response.responseObject) {
@@ -1317,7 +1317,7 @@
         parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value());
         if (m_currentBrowsingContext)
             parameters->setString("frameHandle"_s, m_currentBrowsingContext.value());
-        parameters->setString("function"_s, ElementDisplayedJavaScript);
+        parameters->setString("function"_s, String(ElementDisplayedJavaScript, sizeof(ElementDisplayedJavaScript)));
         parameters->setArray("arguments"_s, WTFMove(arguments));
         m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {
             if (response.isError || !response.responseObject) {
@@ -1359,7 +1359,7 @@
         parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value());
         if (m_currentBrowsingContext)
             parameters->setString("frameHandle"_s, m_currentBrowsingContext.value());
-        parameters->setString("function"_s, ElementAttributeJavaScript);
+        parameters->setString("function"_s, String(ElementAttributeJavaScript, sizeof(ElementAttributeJavaScript)));
         parameters->setArray("arguments"_s, WTFMove(arguments));
         m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {
             if (response.isError || !response.responseObject) {
@@ -1585,7 +1585,7 @@
         parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value());
         if (m_currentBrowsingContext)
             parameters->setString("frameHandle"_s, m_currentBrowsingContext.value());
-        parameters->setString("function"_s, FormElementClearJavaScript);
+        parameters->setString("function"_s, String(FormElementClearJavaScript, sizeof(FormElementClearJavaScript)));
         parameters->setArray("arguments"_s, WTFMove(arguments));
         m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [protectedThis = makeRef(*this), completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {
             if (response.isError) {

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to