Fix minor errors in code.

* m_maxDesc was used without initialization.
* client-common module passed wrong value to poll if
  connect returns EINPROGRESS (was POLLIN, should be  POLLOUT)

Change backported from security-server repository.

Change-Id: I4df6d67ff2214bd0ad857744a2c82bff5e7be299
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/src/client/client-common.cpp b/src/client/client-common.cpp
index 97176e5..783da66 100644 (file)
--- a/src/client/client-common.cpp
+++ b/src/client/client-common.cpp
@@ -120,7 +120,7 @@ public:
 
         int retval = TEMP_FAILURE_RETRY(connect(m_sock, (struct sockaddr*)&clientAddr, SUN_LEN(&clientAddr)));
         if ((retval == -1) && (errno == EINPROGRESS)) {
-            if (0 >= waitForSocket(m_sock, POLLIN, POLL_TIMEOUT)) {
+            if (0 >= waitForSocket(m_sock, POLLOUT, POLL_TIMEOUT)) {
                 LogError("Error in waitForSocket.");
                 return SECURITY_MANAGER_API_ERROR_SOCKET;
             }

diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
index cdbb191..7341c7f 100644 (file)
--- a/src/server/main/socket-manager.cpp
+++ b/src/server/main/socket-manager.cpp
@@ -136,7 +136,8 @@ SocketManager::CreateDefaultReadSocketDescription(int sock, bool timeout)
 }
 
 SocketManager::SocketManager()
-  : m_counter(0)
+  : m_maxDesc(0)
+  , m_counter(0)
 {
     FD_ZERO(&m_readSet);
     FD_ZERO(&m_writeSet);