From 37c5c0d98ac4af62acf694a464c2127fecaacc52 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Apr 2015 01:12:42 +0200 Subject: [PATCH] (D3D) Don't use new/delete --- gfx/d3d/d3d.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index 24439dc021..a286686a33 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -693,16 +693,13 @@ static void *d3d_init(const video_info_t *info, } #endif - vid = new d3d_video_t(); + vid = (d3d_video_t*)calloc(1, sizeof(*vid)); if (!vid) - return NULL; + goto error; vid->ctx_driver = d3d_get_context(vid); if (!vid->ctx_driver) - { - delete vid; - return NULL; - } + goto error; /* Default values */ vid->g_pD3D = NULL; @@ -721,8 +718,7 @@ static void *d3d_init(const video_info_t *info, if (!d3d_construct(vid, info, input, input_data)) { RARCH_ERR("[D3D]: Failed to init D3D.\n"); - delete vid; - return NULL; + goto error; } #ifdef _XBOX @@ -731,6 +727,11 @@ static void *d3d_init(const video_info_t *info, #endif return vid; + +error: + if (vid) + free(vid); + return NULL; } static void d3d_free(void *data) @@ -764,7 +765,7 @@ static void d3d_free(void *data) #endif if (d3d) - delete d3d; + free(d3d); #ifndef _XBOX UnregisterClass("RetroArch", GetModuleHandle(NULL));