[PATCH] jscript: Check for arg_array being NULL (Coverity)

Marcus Meissner marcus at jet.franken.de
Sun Sep 20 16:13:03 CDT 2009


Hi,

arg_array might be NULL after iface_to_jsdisp().

Ciao, Marcus
---
 dlls/jscript/function.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index 6922275..15cce96 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -423,7 +423,9 @@ static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR
 
         if(V_VT(get_arg(dp,1)) == VT_DISPATCH) {
             arg_array = iface_to_jsdisp((IUnknown*)V_DISPATCH(get_arg(dp,1)));
-            if(!is_class(arg_array, JSCLASS_ARRAY) && !is_class(arg_array, JSCLASS_ARGUMENTS)) {
+            if(arg_array && (
+                !is_class(arg_array, JSCLASS_ARRAY) && !is_class(arg_array, JSCLASS_ARGUMENTS)
+            )) {
                 jsdisp_release(arg_array);
                 arg_array = NULL;
             }
-- 
1.5.6



More information about the wine-patches mailing list