Fixing execution of user JavaScript in IE to allow comment at end of line

jimevans · jimevans · commit 53bb2c4e0330 · 2019-03-29T10:20:27.000-07:00
diff --git a/cpp/iedriver/CommandHandlers/ExecuteAsyncScriptCommandHandler.cpp b/cpp/iedriver/CommandHandlers/ExecuteAsyncScriptCommandHandler.cpp
@@ -100,7 +100,7 @@ void ExecuteAsyncScriptCommandHandler::ExecuteInternal(
   async_script += L"if (document.__$webdriverAsyncExecutor.asyncScriptResult !== undefined) {\n";
   async_script += L"  delete document.__$webdriverAsyncExecutor.asyncScriptResult;\n";
   async_script += L"}\n";
-  async_script += L"(function() {" + script_body + L"}).apply(null, argsArray);\n";
+  async_script += L"(function() {\n" + script_body + L"\n}).apply(null, argsArray);\n";
   async_script += L"};})();";
 
   std::wstring polling_script = L"(function() { return function(){\n";
diff --git a/cpp/iedriver/CommandHandlers/ExecuteScriptCommandHandler.cpp b/cpp/iedriver/CommandHandlers/ExecuteScriptCommandHandler.cpp
@@ -60,7 +60,7 @@ void ExecuteScriptCommandHandler::ExecuteInternal(
   }
 
   std::string script_body = script_parameter_iterator->second.asString();
-  const std::string script_source = "(function() { return function(){" + script_body + "};})();";
+  const std::string script_source = "(function() { return function(){\n" + script_body + "\n};})();";
 
   Json::Value json_args(args_parameter_iterator->second);
 
diff --git a/cpp/iedriver/IEDriver.rc b/cpp/iedriver/IEDriver.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,141,5,12
- PRODUCTVERSION 3,141,5,12
+ FILEVERSION 3,141,5,13
+ PRODUCTVERSION 3,141,5,13
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Software Freedom Conservancy"
             VALUE "FileDescription", "Driver library for the IE driver"
-            VALUE "FileVersion", "3.141.5.12"
+            VALUE "FileVersion", "3.141.5.13"
             VALUE "InternalName", "IEDriver.dll"
             VALUE "LegalCopyright", "Copyright (C) 2019"
             VALUE "OriginalFilename", "IEDriver.dll"
             VALUE "ProductName", "Selenium WebDriver"
-            VALUE "ProductVersion", "3.141.5.12"
+            VALUE "ProductVersion", "3.141.5.13"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/iedriverserver/CHANGELOG b/cpp/iedriverserver/CHANGELOG
@@ -9,6 +9,10 @@ available via the project downloads page. Changes in "revision" field indicate
 private releases checked into the prebuilts directory of the source tree, but
 not made generally available on the downloads page.
 
+v3.151.5.13
+===========
+ * Fixed execution of user JavaScript to allow comment at end of line.
+
 v3.151.5.12
 ===========
  * (on behalf of Reinhold Degenfellner) Updated to allow retries for finding
diff --git a/cpp/iedriverserver/IEDriverServer.rc b/cpp/iedriverserver/IEDriverServer.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,141,5,12
- PRODUCTVERSION 3,141,5,12
+ FILEVERSION 3,141,5,13
+ PRODUCTVERSION 3,141,5,13
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Software Freedom Conservancy"
             VALUE "FileDescription", "Command line server for the IE driver"
-            VALUE "FileVersion", "3.141.5.12"
+            VALUE "FileVersion", "3.141.5.13"
             VALUE "InternalName", "IEDriverServer.exe"
             VALUE "LegalCopyright", "Copyright (C) 2019"
             VALUE "OriginalFilename", "IEDriverServer.exe"
             VALUE "ProductName", "Selenium WebDriver"
-            VALUE "ProductVersion", "3.141.5.12"
+            VALUE "ProductVersion", "3.141.5.13"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/prebuilt/Win32/Release/IEDriverServer.exe b/cpp/prebuilt/Win32/Release/IEDriverServer.exe
diff --git a/cpp/prebuilt/x64/Release/IEDriverServer.exe b/cpp/prebuilt/x64/Release/IEDriverServer.exe

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ void ExecuteScriptCommandHandler::ExecuteInternal(`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`std::string script_body = script_parameter_iterator->second.asString();`
`63`		`- const std::string script_source = "(function() { return function(){" + script_body + "};})();";`
	`63`	`+ const std::string script_source = "(function() { return function(){\n" + script_body + "\n};})();";`
`64`	`64`
`65`	`65`	`Json::Value json_args(args_parameter_iterator->second);`
`66`	`66`