From: Jaeun Choi <jaeun12.choi@samsung.com>
Date: Wed, 9 Aug 2017 07:16:35 +0000 (+0900)
Subject: elm_color_class: add null checking after memory allocation
X-Git-Tag: submit/tizen_3.0/20170816.054926~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1010d51b9b0e61a67a324cafd0b9733dc233f5bb;p=platform%2Fupstream%2Felementary.git

elm_color_class: add null checking after memory allocation

origin: upstream (15bbf4712ee1e9356fa975de6f2861bc5ce3076a)

Change-Id: Id9b82282635f8b722f6d282f3d0e84ee98aafdb0
---

diff --git a/src/lib/elm_color_class.c b/src/lib/elm_color_class.c
index 39b90da2f..3e63016c1 100644
--- a/src/lib/elm_color_class.c
+++ b/src/lib/elm_color_class.c
@@ -219,6 +219,8 @@ _colorclass_activate(void *data, Eo *obj EINA_UNUSED,
    else
      {
         cc->current = calloc(1, sizeof(Colorclass)); //actually Elm_Color_Overlay
+        if (!cc->current) return;
+
         memcpy(cc->current, ecc, sizeof(Elm_Color_Overlay));
         cc->current->name = eina_stringshare_ref(ecc->name);
      }
@@ -691,6 +693,8 @@ elm_color_class_editor_add(Evas_Object *obj)
              Colorclass *lcc;
 
              ecc2 = malloc(sizeof(Edje_Color_Class));
+             if (!ecc2) continue;
+
              memcpy(ecc2, ecc, sizeof(Edje_Color_Class));
              ecc2->name = eina_stringshare_add(ecc->name);
              if (tl_cb)
@@ -819,6 +823,8 @@ elm_color_class_util_edje_file_list(Eina_File *f)
    EINA_ITERATOR_FOREACH(it, ecc)
      {
         ecc2 = malloc(sizeof(Edje_Color_Class));
+        if (!ecc2) continue;
+
         memcpy(ecc2, ecc, sizeof(Edje_Color_Class));
         ecc2->name = eina_stringshare_add(ecc->name);
         if (tl_cb)