Fix static analysis issues

Changes:
 - Adds exception handling.

Change-Id: I0e20206337040eba4430afc32bd1ec79ddde3c6a
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/aul/socket/client_socket.cc b/aul/socket/client_socket.cc
index 3f3e793..8d7abae 100644 (file)
--- a/aul/socket/client_socket.cc
+++ b/aul/socket/client_socket.cc
@@ -55,8 +55,13 @@ void ClientSocket::Close() {
 
 void ClientSocket::Connect(const std::string& endpoint) {
   int flag = fcntl(fd_, F_GETFL, 0);
-  fcntl(GetFd(), F_SETFL, flag | O_NONBLOCK);
+  if (flag == -1) {
+    int ret = -errno;
+    _E("Failed to fcntl(%d, F_GETFL, 0). errno(%d)", fd_, errno);
+    THROW(ret);
+  }
 
+  fcntl(GetFd(), F_SETFL, flag | O_NONBLOCK);
   struct sockaddr_un sockaddr = { 0, };
   sockaddr.sun_family = AF_UNIX;
   snprintf(sockaddr.sun_path, sizeof(sockaddr.sun_path), "%s",

diff --git a/src/aul_watchdog.cc b/src/aul_watchdog.cc
index ca6f748..27d852c 100644 (file)
--- a/src/aul_watchdog.cc
+++ b/src/aul_watchdog.cc
@@ -37,8 +37,13 @@ class WatchdogContext {
   ~WatchdogContext() {
     Stop();
 
-    if (enabled_)
-      Disable();
+    if (enabled_) {
+      try {
+        Disable();
+      } catch (const Exception& e) {
+        _E("Exception occurs. error(%d)", e.GetErrorCode());
+      }
+    }
   }
 
   void Enable() {