Add a handler to avoid using invalid handle

[platform/core/appfw/app-core.git] / src / base / appcore_base.c

diff --git a/src/base/appcore_base.c b/src/base/appcore_base.c
index 3e3c767..47527a0 100644 (file)
--- a/src/base/appcore_base.c
+++ b/src/base/appcore_base.c
@@ -622,7 +622,7 @@ static void __on_region_change(keynode_t *key, void *data)
        const char *name;
 
        name = vconf_keynode_get_name(key);
-       if (!strcmp(name, VCONFKEY_REGIONFORMAT))
+       if (name && !strcmp(name, VCONFKEY_REGIONFORMAT))
                val = vconf_keynode_get_str(key);
 
        __update_region();
@@ -1134,6 +1134,9 @@ EXPORT_API int appcore_base_remove_event(appcore_base_event_h handle)
        appcore_base_event_node *node = handle;
        enum appcore_base_event event;
 
+       if (!node || !g_list_find(__events, node))
+               return -1;
+
        event = node->type;
        __events = g_list_remove(__events, node);
        free(node);