From: Youngjae Shin <yj99.shin@samsung.com>
Date: Wed, 23 Jun 2021 07:10:25 +0000 (+0900)
Subject: revise code for unhandled cases
X-Git-Tag: submit/tizen/20210623.100758^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_6.5;p=platform%2Fcore%2Fcontext%2Fcontext-service.git

revise code for unhandled cases

Change-Id: I29fb6ceeca5da20428f252259612a58bae8eac79
---

diff --git a/src/agent/AgentMain.cpp b/src/agent/AgentMain.cpp
index eba8448..27b0fc1 100644
--- a/src/agent/AgentMain.cpp
+++ b/src/agent/AgentMain.cpp
@@ -41,11 +41,15 @@ int main(int argc, char **argv)
 	std::signal(SIGTERM, __on_signal);
 	std::signal(SIGQUIT, __on_signal);
 
-	AgentDBus agentDBus;
-	AgentUtil agentUtil(agentDBus);
-	PluginLoader pluginLoader(agentUtil);
-	AgentSocket agentSocket(pluginLoader);
-
+	try {
+		AgentDBus agentDBus;
+		AgentUtil agentUtil(agentDBus);
+		PluginLoader pluginLoader(agentUtil);
+		AgentSocket agentSocket(pluginLoader);
+	} catch (...) {
+		_E("Initialization Fail");
+		return EXIT_FAILURE;
+	}
 	sd_notify(0, "READY=1");
 
 	__mainLoop.start();
diff --git a/src/agent/AgentSocket.cpp b/src/agent/AgentSocket.cpp
index f9d6fb5..2277a16 100644
--- a/src/agent/AgentSocket.cpp
+++ b/src/agent/AgentSocket.cpp
@@ -220,7 +220,7 @@ bool AgentSocket::__terminate()
 	IF_FAIL_RETURN_TAG(strlen(path) < sizeof(addr.sun_path), false, _E, "Invalid path");
 
 	sock = socket(AF_UNIX, SOCK_STREAM, 0);
-	IF_FAIL_RETURN_TAG(sock > 0, false, _E, "socket creation failed");
+	IF_FAIL_RETURN_TAG(sock != -1, false, _E, "socket creation failed");
 
 	bzero(&addr, sizeof(addr));
 	addr.sun_family = AF_UNIX;