Module: wine Branch: master Commit: 026576995ead1df76e56546b981a7dce398fd808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026576995ead1df76e56546b98...
Author: Huw Davies huw@codeweavers.com Date: Fri Dec 11 13:28:19 2009 +0000
oleaut32: Fix double-free in tests.
Found by Valgrind.
---
dlls/oleaut32/tests/vartype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7e7fe35..3ea6ac2 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -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); \ if (bstr) {WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); SysFreeString(bstr);} \ else buff[0] = 0; \ @@ -4901,7 +4902,7 @@ static void test_VarBstrFromDate(void) char buff[256]; LCID lcid; HRESULT hres; - BSTR bstr = NULL; + BSTR bstr;
CHECKPTR(VarBstrFromDate); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);