Correcting logic error in IE driver alert handling.

A slight logic error in the alert handling code was causing the alert handling to not wait for the alert to be completely dismissed before continuing. This was causing a race condition that could lead to crashes when quitting the browser if certain types of alerts were active. Fixes issue SeleniumHQ#5489.
Zitrax · Apr 17, 2013 · a6861f9 · a6861f9
1 parent 2b6b0d1
commit a6861f9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/cpp/IEDriver/Alert.cpp b/cpp/IEDriver/Alert.cpp
@@ -166,7 +166,7 @@ int Alert::ClickAlertButton(DialogButtonInfo button_info) {
   // algorithim, since the busy property of the browser may
   // not be the right thing to check here.
   int retry_count = 20;
-  while (::IsWindow(this->alert_handle_) && this->browser_->IsBusy() && retry_count > 0) {
+  while ((::IsWindow(this->alert_handle_) || this->browser_->IsBusy()) && retry_count > 0) {
     ::Sleep(50);
     retry_count--;
   }

diff --git a/cpp/IEDriverServer/CHANGELOG b/cpp/IEDriverServer/CHANGELOG
@@ -9,6 +9,14 @@ 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.
 
+v2.32.3.1
+=========
+ * Corrected logic error in alert handling. A slight logic error in the alert
+   handling code was causing the alert handling to not wait for the alert to be
+   completely dismissed before continuing. This was causing a race condition
+   that could lead to crashes when quitting the browser if certain types of
+   alerts were active. Fixes issue #5489.
+
 v2.32.3.0
 =========
  * Corrected number of script arguments in InputManager::SendKeystrokes. In a

diff --git a/cpp/IEDriverServer/IEDriverServer.rc b/cpp/IEDriverServer/IEDriverServer.rc
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