oleaut32: Fix accessing beyond end of buffer and memory leak in test_DispCallFunc.

The parameter isn't automatically converted by DispCallFunc, so make sure we pass in the correct size of memory for the function to store its BSTR in.

oleaut32: Fix accessing beyond end of buffer and memory leak in test_DispCallFunc.
a94265e5 · Rob Shearman · Alexandre Julliard · db33e8fd · a94265e5
Commit a94265e5 authored Nov 29, 2009 by Rob Shearman Committed by Alexandre Julliard Nov 29, 2009
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

tmarshal.c dlls/oleaut32/tests/tmarshal.c +3 -2

No files found.
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -1388,7 +1388,7 @@ static void test_DispCallFunc(void)
    V_VT(&vararg[0]) = VT_R8;
    V_R8(&vararg[0]) = 3.141;
    V_VT(&vararg[1]) = VT_BSTR;
-    V_BSTR(&vararg[1]) = SysAllocString(szEmpty);
+    V_BSTRREF(&vararg[1]) = CoTaskMemAlloc(sizeof(BSTR));
    V_VT(&vararg[2]) = VT_BSTR;
    V_BSTR(&vararg[2]) = SysAllocString(szEmpty);
    V_VT(&vararg[3]) = VT_VARIANT|VT_BYREF;
@@ -1399,7 +1399,8 @@ static void test_DispCallFunc(void)
    hr = DispCallFunc(pWidget, 9*sizeof(void*), CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult);
    ok_ole_success(hr, DispCallFunc);
    VariantClear(&varresult);
-    VariantClear(&vararg[1]);
+    SysFreeString(*V_BSTRREF(&vararg[1]));
+    CoTaskMemFree(V_BSTRREF(&vararg[1]));
    VariantClear(&vararg[2]);
    IWidget_Release(pWidget);
 }