[PATCH] mshtml: Switch two checks (Coverity)

Marcus Meissner meissner at suse.de
Wed Nov 23 19:25:25 CST 2011


Hi,

Dereferencing and then checking for NULL is kind of useless
and likely unintended.

CID 5467

Ciao, Marcus
---
 dlls/mshtml/navigate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 2d8bcd8..9556a00 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -2069,7 +2069,7 @@ HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base
         }
     }
 
-    if(window->doc_obj->is_webbrowser && window->doc_obj && window == window->doc_obj->basedoc.window) {
+    if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) {
         BOOL cancel = FALSE;
         IUri *uri;
 
-- 
1.7.1




More information about the wine-patches mailing list