Indrek Altpere : mshtml: Add NULL check to get_frame_by_name.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jun 2 07:50:05 CDT 2015


Module: wine
Branch: master
Commit: 2676488fcd95c70ff18404660877f63ac6838789
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2676488fcd95c70ff18404660877f63ac6838789

Author: Indrek Altpere <efbiaiinzinz at hotmail.com>
Date:   Fri May 29 16:51:50 2015 +0300

mshtml: Add NULL check to get_frame_by_name.

---

 dlls/mshtml/htmlwindow.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 618648e..c53ea16 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -406,6 +406,11 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H
 
         nsIDOMWindow_Release(nswindow);
 
+        if(!window_iter) {
+            WARN("nsIDOMWindow without HTMLOuterWindow: %p\n", nswindow);
+            continue;
+        }
+
         hres = IHTMLElement_get_id(&window_iter->frame_element->element.IHTMLElement_iface, &id);
         if(FAILED(hres)) {
             FIXME("IHTMLElement_get_id failed: 0x%08x\n", hres);




More information about the wine-cvs mailing list