From 2f4920835130442a336ccf13af05d2b481766c28 Mon Sep 17 00:00:00 2001 From: RAJEEV RANJAN Date: Wed, 30 Nov 2011 00:12:10 +0000 Subject: [PATCH] elementary/photocam - [E-devel] [Patch] elm_photocam patch a. Handled memory allocation failure in function grid_create inside source file src/lib/elm_photocam.c of package elementary. b. Fixed Memory leak in functiongrid_create due to return without releasing memory allocated for variable g of type Grid *. Signed-Off-By: RAJEEV RANJAN Signed-Off-By: PRINCE KUMAR DUBEY Signed-Off-By: ChunEon Park SVN revision: 65698 --- src/lib/elm_photocam.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c index cc09090ca..a1d04a039 100644 --- a/src/lib/elm_photocam.c +++ b/src/lib/elm_photocam.c @@ -289,6 +289,7 @@ grid_create(Evas_Object *obj) if (!wd) return NULL; g = calloc(1, sizeof(Grid)); + if (!g) return NULL; g->zoom = grid_zoom_calc(wd->zoom); g->tsize = wd->tsize; @@ -297,7 +298,11 @@ grid_create(Evas_Object *obj) g->w = g->iw / g->zoom; g->h = g->ih / g->zoom; - if (g->zoom >= 8) return NULL; + if (g->zoom >= 8) + { + free(g); + return NULL; + } g->gw = (g->w + g->tsize - 1) / g->tsize; g->gh = (g->h + g->tsize - 1) / g->tsize; g->grid = calloc(1, sizeof(Grid_Item) * g->gw * g->gh); -- 2.34.1