oleaut32: Initialise BSTR pointer to NULL in VARIANT_UserUnmarshal.

Initialise BSTR pointer to NULL before calling BSTR_UserUnmarshal, otherwise BSTR_UserUnmarshal will try to use the memory in the pointer.

oleaut32: Initialise BSTR pointer to NULL in VARIANT_UserUnmarshal.
a963fd62 · Robert Shearman · Alexandre Julliard · 7ca82cd6 · a963fd62
Commit a963fd62 authored Apr 18, 2006 by Robert Shearman Committed by Alexandre Julliard Apr 18, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

usrmarshal.c dlls/oleaut32/usrmarshal.c +2 -1

No files found.
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -462,11 +462,12 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(unsigned long *pFlags, unsigned cha

  switch (var->vt) {
  case VT_BSTR:
+    V_BSTR(pvar) = NULL;
    Pos = BSTR_UserUnmarshal(pFlags, Pos, &V_BSTR(pvar));
    break;
  case VT_BSTR | VT_BYREF:
    pvar->n1.n2.n3.byref = CoTaskMemAlloc(sizeof(BSTR));
-    *(BSTR*)pvar->n1.n2.n3.byref = NULL;
+    *(BSTR*)V_BYREF(pvar) = NULL;
    Pos = BSTR_UserUnmarshal(pFlags, Pos, V_BSTRREF(pvar));
    break;
  case VT_VARIANT | VT_BYREF: