[waffle] [PATCH 6/8] android: plug memory leak in droid_window_create()

Emil Velikov emil.l.velikov at gmail.com
Tue Apr 5 22:52:23 UTC 2016


Prior to last few commits, leaking self might have been required. With
droid_create_surface() in proper shape we can correctly tear it down.

This effectively reverts commit 0009b5d0d2f "android: Improve name of
'error' goto label" with the commit message of which sharing no
information why this is needed.

Cc: Arun Sl <arun.sl at tcs.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/waffle/android/droid_window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/waffle/android/droid_window.c b/src/waffle/android/droid_window.c
index 048a2bb..dcfd31b 100644
--- a/src/waffle/android/droid_window.c
+++ b/src/waffle/android/droid_window.c
@@ -66,7 +66,7 @@ droid_window_create(struct wcore_platform *wc_plat,
     self->pANWContainer = droid_create_surface(width, height,
                                                dpy->pSFContainer);
     if (!self->pANWContainer)
-        goto error_droid_create_surface;
+        goto error;
 
     ok = wegl_window_init(&self->wegl, wc_config,
                           (intptr_t) *((intptr_t*)(self->pANWContainer)));
@@ -77,7 +77,6 @@ droid_window_create(struct wcore_platform *wc_plat,
 
 error:
     droid_window_destroy(&self->wegl.wcore);
-error_droid_create_surface:
     return NULL;
 }
 
-- 
2.8.0



More information about the waffle mailing list