[PATCH] mshtml: Check parameter load_group before calling RemoveRequest (Bug 31627)

Bernhard Übelacker bernhardu at vr-web.de
Fri Sep 7 07:04:20 CDT 2012


---
  dlls/mshtml/navigate.c |   10 ++++++----
  1 files changed, 6 insertions(+), 4 deletions(-)

http://bugs.winehq.org/show_bug.cgi?id=31627

Check parameter load_group to be not NULL before calling RemoveRequest 
in nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect.

-------------- next part --------------
>From 7edabb4f1a193a07996b833f37bc92e07b2b985b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernhardu at vr-web.de>
Date: Fri, 7 Sep 2012 13:56:25 +0200
Subject: mshtml: Check parameter load_group before calling RemoveRequest (Bug 31627)

---
 dlls/mshtml/navigate.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 91705dd..cd918e4 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -1269,10 +1269,12 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAs
     }
 
     if(old_nschannel) {
-        nsres = nsILoadGroup_RemoveRequest(old_nschannel->load_group,
-                (nsIRequest*)&old_nschannel->nsIHttpChannel_iface, NULL, NS_OK);
-        if(NS_FAILED(nsres))
-            ERR("RemoveRequest failed: %08x\n", nsres);
+        if(old_nschannel->load_group) {
+            nsres = nsILoadGroup_RemoveRequest(old_nschannel->load_group,
+                    (nsIRequest*)&old_nschannel->nsIHttpChannel_iface, NULL, NS_OK);
+            if(NS_FAILED(nsres))
+                ERR("RemoveRequest failed: %08x\n", nsres);
+        }
         nsIHttpChannel_Release(&old_nschannel->nsIHttpChannel_iface);
     }
 
-- 
1.7.2.5



More information about the wine-patches mailing list