Jacek Caban : rpcrt4: Use MustFree for all non-base types in get_param_pointer_info.

Alexandre Julliard julliard at winehq.org
Tue Jun 2 08:11:19 CDT 2020


Module: wine
Branch: stable
Commit: 663cbd7fd5a719149102626d5ad4d2fc1bc62f0e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=663cbd7fd5a719149102626d5ad4d2fc1bc62f0e

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Jan 30 20:02:53 2020 +0100

rpcrt4: Use MustFree for all non-base types in get_param_pointer_info.

Fixes a leak for VT_VARIANT.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 1980fcafe111c5e6958bc01b121cfbd0a42a5abd)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/rpcrt4/ndr_typelib.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c
index fb78c9b5ab..c90c60c7b8 100644
--- a/dlls/rpcrt4/ndr_typelib.c
+++ b/dlls/rpcrt4/ndr_typelib.c
@@ -925,12 +925,6 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int
         ITypeInfo_ReleaseTypeAttr(refinfo, attr);
         ITypeInfo_Release(refinfo);
         break;
-    case VT_BSTR:
-        *flags |= IsSimpleRef | MustFree;
-        *tfs_tdesc = tdesc;
-        if (!is_in && is_out)
-            *server_size = sizeof(void *);
-        break;
     default:
         *flags |= IsSimpleRef;
         *tfs_tdesc = tdesc;
@@ -938,6 +932,8 @@ static HRESULT get_param_pointer_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int
             *server_size = type_memsize(typeinfo, tdesc);
         if ((*basetype = get_basetype(typeinfo, tdesc)))
             *flags |= IsBasetype;
+        else
+            *flags |= MustFree;
         break;
     }
 




More information about the wine-cvs mailing list