From: sooyeon.kim <sooyeon.kim@samsung.com>
Date: Thu, 29 Dec 2016 12:49:12 +0000 (+0900)
Subject: Fix dbus close connection and Add dangling pointer checker
X-Git-Tag: accepted/tizen/common/20170117.174608~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5e07da4116f1e98593b4e0f078dc58a591b6a94;hp=10f7b666cebe91587c946d7385612437c41f2cf6;p=platform%2Fcore%2Fuifw%2Fstt.git

Fix dbus close connection and Add dangling pointer checker

Change-Id: I14febbe09f983b93f02ebf06dac10686cc49e541
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
(cherry picked from commit 3e95b38a21ed23c279d5cec2f191736b67ac3ebb)
---

diff --git a/server/sttd_dbus.c b/server/sttd_dbus.c
index 1bfcc03..0f68473 100644
--- a/server/sttd_dbus.c
+++ b/server/sttd_dbus.c
@@ -26,6 +26,7 @@
 
 static DBusConnection* g_conn_sender = NULL;
 static DBusConnection* g_conn_listener = NULL;
+static DBusConnection* g_conn_custom = NULL;
 
 static Ecore_Fd_Handler* g_dbus_fd_handler = NULL;
 
@@ -499,6 +500,25 @@ void __sttd_dbus_service_free()
 	}
 }
 
+void __sttd_dbus_connection_free()
+{
+	if (NULL != g_conn_listener) {
+		dbus_connection_close(g_conn_listener);
+		dbus_connection_unref(g_conn_listener);
+		g_conn_listener = NULL;
+	}
+	if (NULL != g_conn_sender) {
+		dbus_connection_close(g_conn_sender);
+		dbus_connection_unref(g_conn_sender);
+		g_conn_sender = NULL;
+	}
+	if (NULL != g_conn_custom) {
+		dbus_connection_close(g_conn_custom);
+		dbus_connection_unref(g_conn_custom);
+		g_conn_custom = NULL;
+	}
+}
+
 int __sttd_get_buxtonkey()
 {
 	/* request our name on the bus and check for errors */
@@ -588,6 +608,8 @@ int __sttd_get_buxtonkey()
 		bux_cli = NULL;
 		bux_layer = NULL;
 		bux_val = NULL;
+
+		__sttd_dbus_service_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
@@ -615,7 +637,6 @@ int __sttd_get_buxtonkey()
 
 int __sttd_request_custom_dbus_name()
 {
-	static DBusConnection* g_conn_custom = NULL;
 	DBusError err;
 	dbus_error_init(&err);
 
@@ -624,18 +645,21 @@ int __sttd_request_custom_dbus_name()
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail dbus_bus_get : %s", err.message);
 		dbus_error_free(&err);
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
 	int ret = dbus_bus_request_name(g_conn_custom, STT_SERVER_CUSTOM_SERVICE_NAME, DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
 	if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to be primary owner");
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_request_name() : %s", err.message);
 		dbus_error_free(&err);
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
@@ -643,6 +667,7 @@ int __sttd_request_custom_dbus_name()
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message);
 		dbus_error_free(&err);
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
@@ -683,6 +708,7 @@ int sttd_dbus_open_connection()
 
 	if (NULL == g_conn_listener) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get dbus connection");
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
@@ -690,12 +716,16 @@ int sttd_dbus_open_connection()
 	ret = __sttd_get_buxtonkey();
 	if (0 != ret) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get buxton key");
+		__sttd_dbus_service_free();
+		__sttd_dbus_connection_free();
 		return ret;
 	}
 
 	ret = __sttd_request_custom_dbus_name();
 	if (0 != ret) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to request custom dbus name");
+		__sttd_dbus_service_free();
+		__sttd_dbus_connection_free();
 		return ret;
 	}
 
@@ -703,12 +733,16 @@ int sttd_dbus_open_connection()
 
 	if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to be primary owner");
+		__sttd_dbus_service_free();
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_request_name() : %s", err.message);
 		dbus_error_free(&err);
+		__sttd_dbus_service_free();
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
@@ -723,6 +757,8 @@ int sttd_dbus_open_connection()
 	if (dbus_error_is_set(&err)) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_add_match() : %s", err.message);
 		dbus_error_free(&err);
+		__sttd_dbus_service_free();
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
@@ -732,6 +768,8 @@ int sttd_dbus_open_connection()
 	g_dbus_fd_handler = ecore_main_fd_handler_add(fd, ECORE_FD_READ, (Ecore_Fd_Cb)listener_event_callback, g_conn_listener, NULL, NULL);
 	if (NULL == g_dbus_fd_handler) {
 		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] Fail to get fd handler");
+		__sttd_dbus_service_free();
+		__sttd_dbus_connection_free();
 		return STTD_ERROR_OPERATION_FAILED;
 	}
 
@@ -748,22 +786,15 @@ int sttd_dbus_close_connection()
 		g_dbus_fd_handler = NULL;
 	}
 
-	dbus_bus_release_name(g_conn_listener, g_server_service_name, &err);
-
-	if (dbus_error_is_set(&err)) {
-		SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message);
-		dbus_error_free(&err);
+	if (NULL != g_conn_listener) {
+		dbus_bus_release_name(g_conn_listener, g_server_service_name, &err);
+		if (dbus_error_is_set(&err)) {
+			SLOG(LOG_ERROR, TAG_STTD, "[Dbus ERROR] dbus_bus_release_name() : %s", err.message);
+			dbus_error_free(&err);
+		}
 	}
 
-	dbus_connection_close(g_conn_listener);
-	dbus_connection_close(g_conn_sender);
-
-	dbus_connection_unref(g_conn_sender);
-	dbus_connection_unref(g_conn_listener);
-
-	g_conn_listener = NULL;
-	g_conn_sender = NULL;
-
+	__sttd_dbus_connection_free();
 	__sttd_dbus_service_free();
 
 	SLOG(LOG_DEBUG, TAG_STTD, "[Server] Close dbus connection");
diff --git a/server/sttd_server.c b/server/sttd_server.c
index 8b91e60..a4f4e32 100755
--- a/server/sttd_server.c
+++ b/server/sttd_server.c
@@ -649,6 +649,7 @@ static Eina_Bool __quit_ecore_loop(void *data)
 
 	stt_network_finalize();
 	sttd_finalize();
+	sttd_dbus_close_connection();
 	ecore_main_loop_quit();
 
 	SLOG(LOG_DEBUG, TAG_STTD, "");