edje: fix more - checking the return value of a function eina_mempool_malloc 08/128408/3 accepted/tizen/unified/20170510.183305 submit/tizen/20170510.073036
authorMinchul Lee <slotus.lee@samsung.com>
Wed, 10 May 2017 01:58:36 +0000 (10:58 +0900)
committerMinchul Lee <slotus.lee@samsung.com>
Wed, 10 May 2017 02:33:14 +0000 (11:33 +0900)
Change-Id: I336470e252d346837bb7a1c3419456d7f532b08f
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
src/lib/edje/edje_calc.c

index 02308cd..e5feb5d 100644 (file)
@@ -749,14 +749,14 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
           {
              ep->param2 = eina_mempool_malloc(_edje_real_part_state_mp,
                                               sizeof(Edje_Real_Part_State));
-//TIZEN_ONLY(20170508): null checking the return value of a function eina_mempool_malloc
              if (ep->param2)
-//
-               memset(ep->param2, 0, sizeof(Edje_Real_Part_State));
-             ep->param2->p.map = eina_cow_alloc(_edje_calc_params_map_cow);
+               {
+                  memset(ep->param2, 0, sizeof(Edje_Real_Part_State));
+                  ep->param2->p.map = eina_cow_alloc(_edje_calc_params_map_cow);
 #ifdef HAVE_EPHYSICS
-             ep->param2->p.physics = eina_cow_alloc(_edje_calc_params_physics_cow);
+                  ep->param2->p.physics = eina_cow_alloc(_edje_calc_params_physics_cow);
 #endif
+               }
           }
         else if (ep->part->type == EDJE_PART_TYPE_EXTERNAL)
           {
@@ -765,9 +765,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
                _edje_external_parsed_params_free(ep->typedata.swallow->swallowed_object,
                                                  ep->param2->external_params);
           }
-//TIZEN_ONLY(20170508): null checking the return value of a function eina_mempool_malloc
         if (ep->param2)
-//
           ep->param2->external_params = NULL;
      }
    else
@@ -1353,7 +1351,7 @@ _edje_part_recalc_single_aspect(Edje *ed,
              /* fix h and vary w */
              if (new_w > params->eval.w)
                {
-                  //             params->w = new_w;
+                  //          params->w = new_w;
                   // EXCEEDS BOUNDS in W
                   new_h = DIV(params->eval.w, amin);
                   new_w = params->eval.w;
@@ -1366,7 +1364,7 @@ _edje_part_recalc_single_aspect(Edje *ed,
              /* fix w and vary h */
              else
                {
-                  //             params->h = new_h;
+                  //          params->h = new_h;
                   // EXCEEDS BOUNDS in H
                   new_h = params->eval.h;
                   new_w = MUL(amin, params->eval.h);