Zebediah Figura : qedit/nullrenderer: Use calloc() in null_renderer_create().
Alexandre Julliard
julliard at winehq.org
Tue Mar 31 16:44:22 CDT 2020
Module: wine
Branch: master
Commit: e838381a645c45f0f48c933245f7b8e0a320a8de
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e838381a645c45f0f48c933245f7b8e0a320a8de
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Mar 30 17:55:13 2020 -0500
qedit/nullrenderer: Use calloc() in null_renderer_create().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qedit/nullrenderer.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c
index 9f29ab7828..61de792750 100644
--- a/dlls/qedit/nullrenderer.c
+++ b/dlls/qedit/nullrenderer.c
@@ -52,7 +52,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface)
NullRendererImpl *filter = impl_from_strmbase_renderer(iface);
strmbase_renderer_cleanup(&filter->renderer);
- CoTaskMemFree(filter);
+ free(filter);
}
static const struct strmbase_renderer_ops renderer_ops =
@@ -64,15 +64,14 @@ static const struct strmbase_renderer_ops renderer_ops =
HRESULT null_renderer_create(IUnknown *outer, IUnknown **out)
{
- NullRendererImpl *pNullRenderer;
+ NullRendererImpl *object;
- *out = NULL;
+ if (!(object = calloc(1, sizeof(*object))))
+ return E_OUTOFMEMORY;
- pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl));
+ strmbase_renderer_init(&object->renderer, outer, &CLSID_NullRenderer, L"In", &renderer_ops);
- strmbase_renderer_init(&pNullRenderer->renderer, outer,
- &CLSID_NullRenderer, L"In", &renderer_ops);
-
- *out = &pNullRenderer->renderer.filter.IUnknown_inner;
+ TRACE("Created null renderer %p.\n", object);
+ *out = &object->renderer.filter.IUnknown_inner;
return S_OK;
}
More information about the wine-cvs
mailing list