ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Don't overwrite pointers in VARIANT_UserUnmarshal so we may free or reuse them.

Browse Source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2016-01-13 09:51:44 +01:00 committed by Alexandre Julliard
parent c1974090c6
commit ba498e6002
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/oleaut32/usrmarshal.c
View File

@ -349,10 +349,6 @@ static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *
ptr = *(DWORD*)Buffer; ptr = *(DWORD*)Buffer;
Buffer += sizeof(DWORD); Buffer += sizeof(DWORD);
/* Clear any existing interface which WdtpInterfacePointer_UserUnmarshal()
would try to release. This has been done already with a VariantClear(). */
*ppunk = NULL;
if(!ptr) if(!ptr)
return Buffer; return Buffer;
@ -528,8 +524,14 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe
memset(V_BYREF(pvar), 0, mem_size); memset(V_BYREF(pvar), 0, mem_size);
} }
if(!(header->vt & VT_ARRAY)) if(!(header->vt & VT_ARRAY)
&& (header->vt & VT_TYPEMASK) != VT_BSTR
&& (header->vt & VT_TYPEMASK) != VT_VARIANT
&& (header->vt & VT_TYPEMASK) != VT_UNKNOWN
&& (header->vt & VT_TYPEMASK) != VT_DISPATCH
&& (header->vt & VT_TYPEMASK) != VT_RECORD)
memcpy(V_BYREF(pvar), Pos, type_size); memcpy(V_BYREF(pvar), Pos, type_size);
if((header->vt & VT_TYPEMASK) != VT_VARIANT) if((header->vt & VT_TYPEMASK) != VT_VARIANT)
Pos += type_size; Pos += type_size;
else else
@ -540,6 +542,14 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe
VariantClear(pvar); VariantClear(pvar);
if(header->vt & VT_ARRAY) if(header->vt & VT_ARRAY)
V_ARRAY(pvar) = NULL; V_ARRAY(pvar) = NULL;
else if((header->vt & VT_TYPEMASK) == VT_BSTR)
V_BSTR(pvar) = NULL;
else if((header->vt & VT_TYPEMASK) == VT_UNKNOWN)
V_UNKNOWN(pvar) = NULL;
else if((header->vt & VT_TYPEMASK) == VT_DISPATCH)
V_DISPATCH(pvar) = NULL;
else if((header->vt & VT_TYPEMASK) == VT_RECORD)
V_RECORD(pvar) = NULL;
else if((header->vt & VT_TYPEMASK) == VT_DECIMAL) else if((header->vt & VT_TYPEMASK) == VT_DECIMAL)
memcpy(pvar, Pos, type_size); memcpy(pvar, Pos, type_size);
else else
@ -564,11 +574,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe
switch (header->vt) switch (header->vt)
{ {
case VT_BSTR: case VT_BSTR:
V_BSTR(pvar) = NULL;
Pos = BSTR_UserUnmarshal(pFlags, Pos, &V_BSTR(pvar)); Pos = BSTR_UserUnmarshal(pFlags, Pos, &V_BSTR(pvar));
break; break;
case VT_BSTR | VT_BYREF: case VT_BSTR | VT_BYREF:
*V_BSTRREF(pvar) = NULL;
Pos = BSTR_UserUnmarshal(pFlags, Pos, V_BSTRREF(pvar)); Pos = BSTR_UserUnmarshal(pFlags, Pos, V_BSTRREF(pvar));
break; break;
case VT_VARIANT | VT_BYREF: case VT_VARIANT | VT_BYREF: