From 2ba947a87c68ae3af478af232afeba4ed1ad91d9 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Wed, 23 Jun 2021 16:10:25 +0900 Subject: [PATCH] revise code for unhandled cases Change-Id: I29fb6ceeca5da20428f252259612a58bae8eac79 --- src/agent/AgentMain.cpp | 14 +++++++++----- src/agent/AgentSocket.cpp | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) 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; -- 2.34.1