>From 8b8b59f6db3136f98336408fe81483cf573a9c36 Mon Sep 17 00:00:00 2001
From: Patryk Kaczmarek <patryk.k@samsung.com>
Date: Wed, 5 Sep 2012 15:05:06 +0200
Subject: [PATCH] Null check fixes in ecore module

Change-Id: I271c386473a0e5c756cd182e09f3a6e6ae39453e
---
 trunk/ecore/src/lib/ecore_evas/ecore_evas_util.c   |    6 ++++++
 trunk/ecore/src/lib/ecore_file/ecore_file.c        |    2 ++
 .../ecore/src/lib/ecore_file/ecore_file_download.c |    6 ++++++
 .../ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c  |   12 ++++++++++++
 4 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/trunk/ecore/src/lib/ecore_evas/ecore_evas_util.c b/trunk/ecore/src/lib/ecore_evas/ecore_evas_util.c
index 5aca86c..cae0da7 100644
--- a/trunk/ecore/src/lib/ecore_evas/ecore_evas_util.c
+++ b/trunk/ecore/src/lib/ecore_evas/ecore_evas_util.c
@@ -426,6 +426,12 @@ ecore_getopt_callback_ecore_evas_list_engines(const Ecore_Getopt *parser __UNUSE
    const char *engine;
    FILE *fp = data;
 
+   if (!storage)
+     {
+        CRIT("Storage is missing");
+        return NULL;
+     }
+
    if (!fp)
      fp = stdout;
 
diff --git a/trunk/ecore/src/lib/ecore_file/ecore_file.c b/trunk/ecore/src/lib/ecore_file/ecore_file.c
index fd06f7d..77b5493 100644
--- a/trunk/ecore/src/lib/ecore_file/ecore_file.c
+++ b/trunk/ecore/src/lib/ecore_file/ecore_file.c
@@ -1011,6 +1011,8 @@ ecore_file_escape_name(const char *filename)
    char *q;
    char buf[PATH_MAX];
 
+   EINA_SAFETY_ON_NULL_RETURN_VAL(filename, NULL);
+
    p = filename;
    q = buf;
    while (*p)
diff --git a/trunk/ecore/src/lib/ecore_file/ecore_file_download.c b/trunk/ecore/src/lib/ecore_file/ecore_file_download.c
index ea8550d..bcd7ea1 100644
--- a/trunk/ecore/src/lib/ecore_file/ecore_file_download.c
+++ b/trunk/ecore/src/lib/ecore_file/ecore_file_download.c
@@ -112,6 +112,12 @@ _ecore_file_download(const char *url,
 #ifdef BUILD_ECORE_CON
    char *dir = ecore_file_dir_get(dst);
 
+   if (!url)
+     {
+        CRIT("Download URL is null");
+        return EINA_FALSE;
+     }
+
    if (!ecore_file_is_dir(dir))
      {
         ERR("%s is not a directory", dir);
diff --git a/trunk/ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c b/trunk/ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c
index cd6ec41..e07c89f 100644
--- a/trunk/ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c
+++ b/trunk/ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c
@@ -299,6 +299,18 @@ EAPI void
 ecore_imf_evas_event_key_up_wrap(Evas_Event_Key_Up *evas_event,
                                  Ecore_IMF_Event_Key_Up *imf_event)
 {
+   if (!evas_event)
+     {
+        CRIT("Evas event is missing");
+        return;
+     }
+
+   if (!storage)
+     {
+        CRIT("Imf event is missing");
+        return;
+     }
+
    imf_event->keyname = evas_event->keyname ? evas_event->keyname : _ecore_imf_evas_event_empty;
    imf_event->key = evas_event->key ? evas_event->key : _ecore_imf_evas_event_empty;
    imf_event->string = evas_event->string ? evas_event->string : _ecore_imf_evas_event_empty;
-- 
1.7.6.3