From 007d0166ab84418ef8e11c0f7b20ab3c7cf64f6e Mon Sep 17 00:00:00 2001 From: Nishant Chaprana Date: Tue, 25 Oct 2016 13:00:50 +0530 Subject: [PATCH] [Fix] NULL dereferencing when ap is already NULL. Change-Id: If1a3596452c442af9119425afcce63e535adbf9c Signed-off-by: Nishant Chaprana --- packaging/ug-setting-wifidirect-efl.spec | 2 +- popup-wifidirect/src/wfd-app-popup-view.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/ug-setting-wifidirect-efl.spec b/packaging/ug-setting-wifidirect-efl.spec index fe45c21..fdbf2f8 100644 --- a/packaging/ug-setting-wifidirect-efl.spec +++ b/packaging/ug-setting-wifidirect-efl.spec @@ -1,6 +1,6 @@ Name: ug-setting-wifidirect-efl Summary: Wi-Fi Direct setting UI gadget -Version: 1.11.79 +Version: 1.11.80 Release: 1 Group: Applications/Network License: Flora-1.1 diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c index b6e8ff2..c7e4b02 100755 --- a/popup-wifidirect/src/wfd-app-popup-view.c +++ b/popup-wifidirect/src/wfd-app-popup-view.c @@ -521,7 +521,8 @@ static Eina_Bool _keypad_popup_timer_cb(void *data) Evas_Object *label = (Evas_Object*) data; wfd_appdata_t *ad = wfd_get_appdata(); - wfd_connection_info_s *connection = ad->connection; + wfd_connection_info_s *connection = NULL; + WFD_RETV_IF(NULL == ad, FALSE, "NULL parameters(ad)\n"); WFD_RETV_IF(NULL == label, FALSE, "NULL parameters(label)\n"); if (NULL == ad->popup) { @@ -529,6 +530,8 @@ static Eina_Bool _keypad_popup_timer_cb(void *data) return ECORE_CALLBACK_CANCEL; } + connection = ad->connection; + keypad_popup_timeout--; if (keypad_popup_timeout > 0) { -- 2.7.4