From 109f0cf485521ff287219c566d7a718a8f73a550 Mon Sep 17 00:00:00 2001 From: "j_yong.hwang" Date: Thu, 11 Jun 2015 16:15:05 +0900 Subject: [PATCH] [Tizen_2.4] vector - fix CID 436455, 436444, 436345 Modify dereference problem before null check. Change-Id: I5ed40ab25ddf53b96ec185cea1460a4d9c246fdd --- src/lib/tizen_vector.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/lib/tizen_vector.c b/src/lib/tizen_vector.c index 4a6f7d3..33d1b27 100644 --- a/src/lib/tizen_vector.c +++ b/src/lib/tizen_vector.c @@ -1418,11 +1418,8 @@ progressbar_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj vd->transit = NULL; if (cur_transit) elm_transit_del(cur_transit); - if (vd) - { - evas_object_data_set(obj, vg_key, NULL); - free(vd); - } + evas_object_data_set(obj, vg_key, NULL); + free(vd); } static void @@ -1795,6 +1792,11 @@ tizen_vg_progressbar_set(Elm_Progressbar *obj) if (!vd) { vd = calloc(1, sizeof(vg_progressbar)); + if (!vd) + { + ERR("Failed to allocate vector graphics data memory"); + return; + } evas_object_data_set(obj, vg_key, vd); vd->obj = obj; // callback to free vd data @@ -1808,12 +1810,6 @@ tizen_vg_progressbar_set(Elm_Progressbar *obj) EVAS_CALLBACK_PRIORITY_BEFORE, progressbar_del_cb, NULL); } - if (!vd) - { - ERR("Failed to allocate vector graphics data memory"); - return; - } - if (!strcmp(str, "default")) { -- 2.7.4