libpepper_efl: fix svace issues

Add null checker below calloc function.

Change-Id: Ibae98b0ca9421b517960037ca45387e8c9391ad9

diff --git a/src/examples/pepper_efl_example.c b/src/examples/pepper_efl_example.c
index 98a7e718d41fcbc61d1a37a4b4437151f5bad5be..4c7a811b3869d723d07d89c1eebd263c7b2be138 100644 (file)
--- a/src/examples/pepper_efl_example.c
+++ b/src/examples/pepper_efl_example.c
@@ -382,11 +382,12 @@ elm_win_create(const char *name, int w, int h)
 EAPI_MAIN int
 elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
 {
-   app_data *d;
-   Evas_Object *win;
-   Evas_Object *bx, *upper_bx, *upper_bx2, *scroller, *bt, *bt2, *bt3, *bt4, *sc_bx, *swap_bt, *close_bt;
-   const char *comp_name;
-   char border_path[64];
+   app_data *d = NULL;
+   Evas_Object *win = NULL;
+   Evas_Object *bx = NULL, *upper_bx = NULL, *upper_bx2 = NULL, *scroller = NULL;
+   Evas_Object *bt = NULL, *bt2 = NULL, *bt3 = NULL, *bt4 = NULL, *sc_bx = NULL, *swap_bt = NULL, *close_bt = NULL;
+   const char *comp_name = NULL;
+   char border_path[64] = {0};
    int ret = EXIT_FAILURE;
    int i, j;
 
@@ -394,6 +395,12 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
 
    d = calloc(1, sizeof(app_data));
 
+   if (!d)
+     {
+        fprintf(stderr, "failed to mem alloc: app_data d\n");
+        goto err_on_memalloc;
+     }
+
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
    win = elm_win_create("Pepper EFL Test", WIDTH, HEIGHT);
 
@@ -567,7 +574,7 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
    /* pepper_efl init */
    comp_name = pepper_efl_compositor_create(win, _comp_name);
    if (!comp_name)
-     return ret;
+     goto err_on_create_compositor;
 
    setenv("WAYLAND_DISPLAY", comp_name, 1);
 
@@ -577,6 +584,13 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
    elm_run();
 
    pepper_efl_compositor_destroy(comp_name);
+   ret = EXIT_SUCCESS;
+
+err_on_create_compositor:
+   if(d)
+     free(d);
+
+err_on_memalloc:
    return ret;
 }
 ELM_MAIN()

diff --git a/src/examples/pepper_efl_simple.c b/src/examples/pepper_efl_simple.c
index 85464095687637ff1cc75fee2e6c1e3d0e199d69..8fcfca6a1017e8cc382599ab659f4acfe33586c5 100644 (file)
--- a/src/examples/pepper_efl_simple.c
+++ b/src/examples/pepper_efl_simple.c
@@ -61,13 +61,19 @@ elm_win_create(const char *name, int w, int h)
 EAPI_MAIN int
 elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
 {
-   app_data *d;
-   Evas_Object *win;
-   const char *comp_name;
+   app_data *d = NULL;
+   Evas_Object *win = NULL;
+   const char *comp_name = NULL;
    int ret = EXIT_FAILURE;
 
    d = calloc(1, sizeof(app_data));
 
+   if (d == NULL)
+     {
+        fprintf(stderr, "failed to mem alloc: app_data d\n");
+        goto err;
+     }
+
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
    win = elm_win_create("Pepper EFL Test", WIDTH, HEIGHT);
    evas_object_show(win);
@@ -92,7 +98,8 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
    ret = EXIT_SUCCESS;
 
 err:
-   free(d);
+   if (d != NULL)
+     free(d);
    return ret;
 }
 ELM_MAIN()

diff --git a/src/examples/thread_sample.c b/src/examples/thread_sample.c
index e1404ee3ea4f1ddc74be85de6510cf6d61026b26..40e25f418d4df72fab0fdfc00cadf21762420677 100644 (file)
--- a/src/examples/thread_sample.c
+++ b/src/examples/thread_sample.c
@@ -9,11 +9,15 @@ static void
 thread_run_cb(void *data, Ecore_Thread *thread)
 {
    int now = 0;
-   int *num;
+   int *num = NULL;
 
    while (1)
      {
         num = (int*)malloc(sizeof(int));
+
+        if (!num)
+             break;
+
         *num = now%5;
         now++;
 
@@ -43,7 +47,7 @@ thread_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
      evas_object_color_set(obj, 125, 125, 125, 255);
 
    free(num);
-
+   num = NULL;
 }
 
 static Evas_Object *

diff --git a/src/lib/input.c b/src/lib/input.c
index 7718c8b187be95dc8e013b334983a7e9284f3938..50804d9b6d3c57816af759c2916d198abd94661a 100644 (file)
--- a/src/lib/input.c
+++ b/src/lib/input.c
@@ -48,13 +48,19 @@ end:
 pepper_efl_input_t *
 pepper_efl_input_create(pepper_efl_comp_t *comp)
 {
-   pepper_efl_input_t *input;
+   pepper_efl_input_t *input = NULL;
    const char *default_name = "seat0";
 
    DBG("Create Input Device");
 
    input = calloc(1, sizeof(*input));
 
+   if (!input)
+     {
+        ERR("failed to memory allocation");
+        goto err_mem_alloc;
+     }
+
    input->seat = pepper_compositor_add_seat(comp->pepper.comp, default_name);
    if (!input->seat)
      {
@@ -96,6 +102,8 @@ err_dev_create:
 err_add_seat:
    free(input);
 
+err_mem_alloc:
+
    return NULL;
 }