Andrew Eikum : oleaut32: Don't clear BSTR size.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Apr 12 06:45:23 CDT 2016


Module: wine
Branch: stable
Commit: e51298c5c52c0ac8c684e71e5ccfb938fd7cf636
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e51298c5c52c0ac8c684e71e5ccfb938fd7cf636

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Tue Jan  5 13:38:21 2016 -0600

oleaut32: Don't clear BSTR size.

The size is used during cache lookup. Clearing it will break lookup
and prevent detection of double-freeing when warn+heap is enabled.

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 3bc2ec33712ed57abf92b8014dda334cb9046d13)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/oleaut32/oleaut.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 0352215..a4a1775 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -280,7 +280,6 @@ void WINAPI SysFreeString(BSTR str)
 
             if(WARN_ON(heap)) {
                 unsigned n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1;
-                bstr->size = ARENA_FREE_FILLER;
                 for(i=0; i<n; i++)
                     bstr->u.dwptr[i] = ARENA_FREE_FILLER;
             }




More information about the wine-cvs mailing list