Zebediah Figura : devenum: Use calloc() in moniker_create().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4994ba2123d9a829ef2708d4647800da7cbac4cf
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4994ba2123d9a829ef2708d46...

Author: Zebediah Figura 
Date:   Sat Apr 11 10:49:42 2020 -0500

devenum: Use calloc() in moniker_create().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/devenum/mediacatenum.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index fff40e4af3..860eef7603 100644
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -405,7 +405,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface)

if (ref == 0) {
         CoTaskMemFree(This->name);
-        CoTaskMemFree(This);
+        free(This);
         DEVENUM_UnlockModule();
     }
     return ref;
@@ -770,20 +770,17 @@ static const IMonikerVtbl IMoniker_Vtbl =

struct moniker *moniker_create(void)
 {
-    struct moniker *pMoniker;
+    struct moniker *object;

-    pMoniker = CoTaskMemAlloc(sizeof(*pMoniker));
-    if (!pMoniker)
+    if (!(object = calloc(1, sizeof(*object))))
         return NULL;

-    pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl;
-    pMoniker->ref = 1;
-    pMoniker->has_class = FALSE;
-    pMoniker->name = NULL;
+    object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl;
+    object->ref = 1;

DEVENUM_LockModule();

-    return pMoniker;
+    return object;
 }

static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface)