Skip to content

W
wine-winehq
Commit 02657699 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

oleaut32: Fix double-free in tests.

Found by Valgrind.
parent 7f9d5aad
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlls/oleaut32/tests/vartype.c
View file @ 02657699
...@@ -4889,7 +4889,8 @@ static void test_VarBstrFromR4(void) ...@@ -4889,7 +4889,8 @@ static void test_VarBstrFromR4(void)
} }
} }
#define BSTR_DATE(dt,str) SysFreeString(bstr); bstr = NULL; \ #define BSTR_DATE(dt,str) \
bstr = NULL; \
hres = pVarBstrFromDate(dt,lcid,LOCALE_NOUSEROVERRIDE,&bstr); \ hres = pVarBstrFromDate(dt,lcid,LOCALE_NOUSEROVERRIDE,&bstr); \
if (bstr) {WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); SysFreeString(bstr);} \ if (bstr) {WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); SysFreeString(bstr);} \
else buff[0] = 0; \ else buff[0] = 0; \
...@@ -4901,7 +4902,7 @@ static void test_VarBstrFromDate(void) ...@@ -4901,7 +4902,7 @@ static void test_VarBstrFromDate(void)
char buff[256]; char buff[256];
LCID lcid; LCID lcid;
HRESULT hres; HRESULT hres;
BSTR bstr = NULL; BSTR bstr;
CHECKPTR(VarBstrFromDate); CHECKPTR(VarBstrFromDate);
lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment