diff --git a/cpp/iedriver/Alert.cpp b/cpp/iedriver/Alert.cpp index 6621ce802e4aa..a5ae2836d20f0 100644 --- a/cpp/iedriver/Alert.cpp +++ b/cpp/iedriver/Alert.cpp @@ -208,6 +208,16 @@ std::string Alert::GetDirectUIDialogText() { if (FAILED(hr)) { LOGHR(WARN, hr) << "Failed to get accName property from text object"; return alert_text_value; + } else if (hr != S_OK) { + // N.B., get_accName can return an error value without it being a + // standard COM error. + LOG(WARN) << "Getting accName property from text object returned an error " + << "(value: " << hr << "). The text object may not have a name."; + return alert_text_value; + } else if (text_bstr == NULL) { + LOG(WARN) << "Getting accName property from text object returned a null " + << "value"; + return alert_text_value; } std::wstring text = text_bstr; diff --git a/cpp/iedriverserver/CHANGELOG b/cpp/iedriverserver/CHANGELOG index 1aa927e1b9f5c..3c33e59470c78 100644 --- a/cpp/iedriverserver/CHANGELOG +++ b/cpp/iedriverserver/CHANGELOG @@ -9,6 +9,11 @@ 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.46.0.0 +========= + * Handles issue with alert text controls conatining no accText property in IE. + Fixes issue #651. + v2.46.0.0 ========= * Release to synchronize with release of Selenium project. diff --git a/cpp/iedriverserver/IEDriverServer.rc b/cpp/iedriverserver/IEDriverServer.rc index e3d1f1f61e0ae..2ed25403b366d 100644 Binary files a/cpp/iedriverserver/IEDriverServer.rc and b/cpp/iedriverserver/IEDriverServer.rc differ diff --git a/cpp/prebuilt/Win32/Release/IEDriverServer.exe b/cpp/prebuilt/Win32/Release/IEDriverServer.exe index 99a6062fd8129..e53d8c4e38cf8 100644 Binary files a/cpp/prebuilt/Win32/Release/IEDriverServer.exe and b/cpp/prebuilt/Win32/Release/IEDriverServer.exe differ diff --git a/cpp/prebuilt/x64/Release/IEDriverServer.exe b/cpp/prebuilt/x64/Release/IEDriverServer.exe index e7a7e040b8c63..2459aaf4606ba 100644 Binary files a/cpp/prebuilt/x64/Release/IEDriverServer.exe and b/cpp/prebuilt/x64/Release/IEDriverServer.exe differ