From 3ed689c0f28d41d0e68aa16c37df9ecc95480631 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 14 Apr 2020 22:22:50 -0500 Subject: [PATCH] devenum: Get rid of the union in struct moniker. To avoid an invalid free in moniker_Release(). Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- dlls/devenum/devenum_private.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index e0c693a2e95..43a5a0c50e1 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -59,11 +59,8 @@ struct moniker CLSID class; BOOL has_class; enum device_type type; - union - { - WCHAR *name; /* for filters and codecs */ - CLSID clsid; /* for DMOs */ - }; + WCHAR *name; /* for filters and codecs */ + CLSID clsid; /* for DMOs */ IPropertyBag IPropertyBag_iface; };