Validate values of parameter, check if not NULL

Change-Id: If57c4125ac7d401731631a4d2fceadcd46446d5e
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/src/common/event.c b/src/common/event.c
index c8327ef41887132f05fde4835b9b35a731be80f6..5015f13539c38e610fd645492a09d6db120a0c53 100644 (file)
--- a/src/common/event.c
+++ b/src/common/event.c
@@ -248,12 +248,13 @@ int event_register_worker(char *name, event_handler_func handler, struct event_w
 
 void event_unregister_worker(struct event_worker *worker)
 {
+       if (!worker)
+               return;
+
        g_main_loop_quit(worker->loop);
 
-       if (worker) {
-               if (worker->queue)
-                       g_async_queue_unref(worker->queue);
+       if (worker->queue)
+               g_async_queue_unref(worker->queue);
 
-               free(worker);
-       }
+       free(worker);
 }

diff --git a/src/proc-usage/proc-usage.c b/src/proc-usage/proc-usage.c
index 2fa8cc613e2b0772ee722155d7af603e1f96c38d..18186f9475ce01f7facac464079d4d6c7bfd97df 100644 (file)
--- a/src/proc-usage/proc-usage.c
+++ b/src/proc-usage/proc-usage.c
@@ -33,14 +33,21 @@
 
 static gboolean proc_usage_event_func(gpointer user_data)
 {
-       struct event *event = (struct event *)user_data;
-       struct proc_usage_event *pue = (struct proc_usage_event *)event->data;
+       struct event *event = NULL;
+       struct proc_usage_event *pue = NULL;
        GVariant *usage = NULL;
 
-       if (!event || !pue) {
+       if (!user_data) {
                _E("Invalid parameter");
                return TRUE;
        }
+       event = (struct event *)user_data;
+
+       if (!event->data) {
+               _E("Invalid parameter");
+               return TRUE;
+       }
+       pue = (struct proc_usage_event *)event->data;
 
        switch (event->type) {
        case PROC_USAGE_EVENT_PROCESS_MEMORY_USAGE: