[PATCH] check for This->frame

Marcus Meissner marcus at jet.franken.de
Sun Jan 13 05:27:14 CST 2008


Hi,

Coverity 645 spotted missing This->frame
checks.

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

diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index 326b0b0..02b5e83 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -621,7 +621,7 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
         if(This->hostui)
             IDocHostUIHandler_HideUI(This->hostui);
 
-        if(This->hostui)
+        if(This->hostui && This->frame)
             IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This),
                 This->frame, This->ip_window);
 
@@ -629,7 +629,8 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
             call_set_active_object(This->ip_window, ACTOBJ(This));
 
         memset(&rcBorderWidths, 0, sizeof(rcBorderWidths));
-        IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths);
+        if (This->frame)
+            IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths);
     }
 
     return S_OK;
-- 
1.5.2.4



More information about the wine-patches mailing list