wbemprox: Set correct variant type if array property value is NULL.

Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wbemprox: Set correct variant type if array property value is NULL.
086a1a4e · Hans Leidekker · Alexandre Julliard · ee81036a · 086a1a4e
Commit 086a1a4e authored Dec 23, 2015 by Hans Leidekker Committed by Alexandre Julliard Dec 23, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

query.c dlls/wbemprox/query.c +2 -1

No files found.
--- a/dlls/wbemprox/query.c
+++ b/dlls/wbemprox/query.c
@@ -841,7 +841,8 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR
        CIMTYPE basetype = view->table->columns[column].type & CIM_TYPE_MASK;

        val_ptr = to_safearray( (const struct array *)(INT_PTR)val, basetype );
-        if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY;
+        if (!val_ptr) vartype = VT_NULL;
+        else if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY;
        goto done;
    }
    switch (view->table->columns[column].type & COL_TYPE_MASK)