Fixing crash encountered when taking screenshot of non-HTML page.

This intentionally does not throw an error, but fails silently, with no screenshot being generated. Fixes issue SeleniumHQ#6576.
showhand · Nov 15, 2013 · e46a294 · e46a294
1 parent d5fbbd4
commit e46a294
Show file tree

Hide file tree

Showing 6 changed files with 6,898 additions and 6,938 deletions.
diff --git a/cpp/iedriver/CommandHandlers/ScreenshotCommandHandler.h b/cpp/iedriver/CommandHandlers/ScreenshotCommandHandler.h
@@ -114,6 +114,10 @@ class ScreenshotCommandHandler : public IECommandHandler {
 
     CComPtr<IHTMLDocument2> document;
     browser->GetDocument(&document);
+    if (!document) {
+      LOG(WARN) << "Unable to get document from browser. Are you viewing a non-HTML document?";
+      return E_ABORT;
+    }
 
     LocationInfo document_info;
     bool result = DocumentHost::GetDocumentDimensions(document, &document_info);

diff --git a/cpp/iedriver/Generated/atoms.h b/cpp/iedriver/Generated/atoms.h
diff --git a/cpp/iedriverserver/CHANGELOG b/cpp/iedriverserver/CHANGELOG
@@ -9,6 +9,13 @@ 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.37.0.4
+=========
+ * Updates to JavaScript automation atoms.
+ * Fixed crash encountered when taking screenshot of non-HTML page. This does
+   not throw an error, but fails silently, with no screenshot being generated.
+   Fixes issue #6576.
+
 v2.37.0.3
 =========
  * Refactored detection of single-text-node child elements in IE. In IE, 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