Skip to content

Commit 8e7cc40

Browse files
larsiverppjimevans
authored andcommitted
Adding HRESULT check in IE driver
Fix for archived issue 7281 (SeleniumHQ/selenium-google-code-issue-archive#7281), basically an HRESULT is not getting checked. Signed-off-by: Jim Evans <james.h.evans.jr@gmail.com>
1 parent 977b17d commit 8e7cc40

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

cpp/iedriver/Element.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,11 +1016,13 @@ bool Element::GetClickableViewPortLocation(const bool document_contains_frames,
10161016
CComPtr<IHTMLDocument2> doc;
10171017
this->GetContainingDocument(false, &doc);
10181018
int document_mode = DocumentHost::GetDocumentMode(doc);
1019-
CComPtr<IHTMLDocument3> document_element_doc;
1019+
CComPtr<IHTMLDocument3> document_element_doc;
1020+
CComPtr<IHTMLElement> document_element;
10201021
HRESULT hr = doc->QueryInterface<IHTMLDocument3>(&document_element_doc);
1021-
if (SUCCEEDED(hr) && document_element_doc && document_mode > 5) {
1022-
CComPtr<IHTMLElement> document_element;
1022+
if (SUCCEEDED(hr) && document_element_doc) {
10231023
hr = document_element_doc->get_documentElement(&document_element);
1024+
}
1025+
if (SUCCEEDED(hr) && document_mode > 5 && document_element) {
10241026
CComPtr<IHTMLElement2> size_element;
10251027
hr = document_element->QueryInterface<IHTMLElement2>(&size_element);
10261028
size_element->get_clientHeight(&window_height);

0 commit comments

Comments
 (0)