Francois Gouget : mshtml: Avoid returning with an unset URL policy in error cases.

Alexandre Julliard julliard at winehq.org
Tue Jul 17 11:05:35 CDT 2012


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

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Jul 17 14:42:18 2012 +0200

mshtml: Avoid returning with an unset URL policy in error cases.

---

 dlls/mshtml/secmgr.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c
index ff349ac..f961bca 100644
--- a/dlls/mshtml/secmgr.c
+++ b/dlls/mshtml/secmgr.c
@@ -20,6 +20,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <assert.h>
 
 #define COBJMACROS
 
@@ -104,9 +105,7 @@ static HRESULT confirm_safety_load(HTMLDocumentNode *This, struct CONFIRMSAFETY
         CATID init_catid = CATID_SafeForInitializing;
 
         hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &init_catid, 0, NULL);
-        if(FAILED(hres))
-            return hres;
-
+        assert(SUCCEEDED(hres));
         *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW;
     }
 




More information about the wine-cvs mailing list