Prevent fix

Change-Id: Ic64896aebd350e2693fc08f4eee30c45ab53898f
Signed-off-by: Sunwook Bae <sunwook45.bae@samsung.com>

diff --git a/src/IpcClient.cpp b/src/IpcClient.cpp
index 4fbc0d9..3b1ed40 100644 (file)
--- a/src/IpcClient.cpp
+++ b/src/IpcClient.cpp
@@ -37,6 +37,7 @@
 #include <queue>
 #include <map>
 
+#include "message-port.h"
 #include "message-port-log.h"
 
 #include "IpcClient.h"
@@ -85,7 +86,7 @@ IpcClient::Construct(const string& serverName, const IIpcClientEventListener* pL
        pthread_mutex_t* pMutex = (pthread_mutex_t*) malloc(sizeof(pthread_mutex_t));
        if (pMutex == NULL)
        {
-               return -2;
+               return MESSAGEPORT_ERROR_OUT_OF_MEMORY;
        }
 
        pthread_mutex_init(pMutex, NULL);
@@ -107,7 +108,7 @@ IpcClient::Construct(const string& serverName, const IIpcClientEventListener* pL
                }
        }
 
-       return 0;
+       return MESSAGEPORT_ERROR_NONE;
 
 }
 
@@ -159,7 +160,7 @@ IpcClient::MakeConnection(bool forReverse)
        if (client < 0)
        {
                _LOGE("Failed to create a socket : %s.", strerror(errno));
-               return -1;
+               return MESSAGEPORT_ERROR_IO_ERROR;
        }
 
        int flags = fcntl(client, F_GETFL, 0);
@@ -270,7 +271,7 @@ IpcClient::MakeConnection(bool forReverse)
                ReleaseFd(client);
        }
 
-       return 0;
+       return MESSAGEPORT_ERROR_NONE;
 
 CATCH:
        if (client != -1)
@@ -278,7 +279,7 @@ CATCH:
                close(client);
        }
 
-       return -1;
+       return MESSAGEPORT_ERROR_IO_ERROR;
 
 }
 
@@ -380,7 +381,7 @@ IpcClient::HandleReceivedMessage(GIOChannel* source, GIOCondition condition)
                                if (pMessage == NULL)
                                {
                                        _LOGE("The memory is insufficient");
-                                       return -2;
+                                       return MESSAGEPORT_ERROR_OUT_OF_MEMORY;
                                }
 
                                if (__pListener)
@@ -418,7 +419,7 @@ IpcClient::AcquireFd(void)
                        if (ret < 0)
                        {
                                _LOGE("Failed to connect to the server.");
-                               return -1;
+                               return MESSAGEPORT_ERROR_IO_ERROR;
                        }
 
                        continue;
@@ -452,7 +453,7 @@ IpcClient::SendAsync(IPC::Message* pMessage)
        if (fd == -1)
        {
                _LOGE("Failed to get fd.");
-               return -1;
+               return MESSAGEPORT_ERROR_IO_ERROR;
        }
 
        int written = 0;
@@ -465,7 +466,7 @@ IpcClient::SendAsync(IPC::Message* pMessage)
 
        ReleaseFd(fd);
 
-       return 0;
+       return MESSAGEPORT_ERROR_NONE;
 }
 
 int
@@ -477,7 +478,7 @@ IpcClient::SendSync(IPC::Message* pMessage)
        if (pSyncMessage == NULL)
        {
                _LOGE("pMessage is not a sync message.");
-               return -1;
+               return MESSAGEPORT_ERROR_IO_ERROR;
        }
 
        int messageId = SyncMessage::GetMessageId(*pSyncMessage);
@@ -486,7 +487,7 @@ IpcClient::SendSync(IPC::Message* pMessage)
        if (fd < 0)
        {
                _LOGE("Failed to get fd.");
-               return -1;
+               return MESSAGEPORT_ERROR_IO_ERROR;
        }
 
        char* pData = (char*) pSyncMessage->data();
@@ -512,13 +513,26 @@ IpcClient::SendSync(IPC::Message* pMessage)
        int readSize = 0;
        char* pEndOfMessage = NULL;
 
+       int ret = 0;
+
        while (true)
        {
-               poll(&pfd, 1, -1);
+               ret = poll(&pfd, 1, -1);
+               if (ret < 0)
+               {
+                       if (errno == EINTR)
+                       {
+                               continue;
+                       }
+
+                       _LOGE("Failed to poll (%d, %s).", errno, strerror(errno));
+                       return MESSAGEPORT_ERROR_IO_ERROR;
+               }
 
                if (pfd.revents & POLLRDHUP)
                {
-                       return -1;
+                       _LOGE("POLLRDHUP");
+                       return MESSAGEPORT_ERROR_IO_ERROR;
                }
 
                if (pfd.revents & POLLIN)
@@ -526,7 +540,10 @@ IpcClient::SendSync(IPC::Message* pMessage)
                        readSize = read(fd, buffer, 1024);
                }
 
-               message.append(buffer, readSize);
+               if (readSize > 0)
+               {
+                       message.append(buffer, readSize);
+               }
 
                pEndOfMessage = (char*) IPC::Message::FindNext(message.data(), message.data() + message.size());
                if (pEndOfMessage)
@@ -535,7 +552,7 @@ IpcClient::SendSync(IPC::Message* pMessage)
                        if (pReply == NULL)
                        {
                                _LOGE("The memory is insufficient.");
-                               return -2;
+                               return MESSAGEPORT_ERROR_OUT_OF_MEMORY;
                        }
 
                        break;
@@ -550,7 +567,7 @@ IpcClient::SendSync(IPC::Message* pMessage)
 
        ReleaseFd(fd);
 
-       return 0;
+       return MESSAGEPORT_ERROR_NONE;
 }
 
 int

diff --git a/src/MessagePortProxy.cpp b/src/MessagePortProxy.cpp
index 87efa7f..eaf285f 100644 (file)
--- a/src/MessagePortProxy.cpp
+++ b/src/MessagePortProxy.cpp
@@ -106,7 +106,7 @@ MessagePortProxy::Construct(void)
 
        free(pAppId);
 
-       return 0;
+       return MESSAGEPORT_ERROR_NONE;
 }
 
 void
@@ -259,7 +259,7 @@ MessagePortProxy::CheckRemotePort(const string& remoteAppId, const string& remot
                        _LOGE("The remote message port (%s) is not found.", remotePort.c_str());
 
                        *exist = false;
-                       return 0;
+                       return MESSAGEPORT_ERROR_NONE;
                }
                else if (return_value == MESSAGEPORT_ERROR_CERTIFICATE_NOT_MATCH)
                {
@@ -276,7 +276,7 @@ MessagePortProxy::CheckRemotePort(const string& remoteAppId, const string& remot
        }
 
        *exist = true;
-       return 0;
+       return MESSAGEPORT_ERROR_NONE;
 }
 
 int
@@ -418,7 +418,7 @@ MessagePortProxy::SendMessageInternal(const BundleBuffer& metadata, const Bundle
                }
        }
 
-       return 0;
+       return MESSAGEPORT_ERROR_NONE;
 }
 
 char*
@@ -469,13 +469,13 @@ MessagePortProxy::CheckTrustedLocalPort(int id, bool* trusted)
                else
                {
                        *trusted = true;
-                       return 0;
+                       return MESSAGEPORT_ERROR_NONE;
                }
        }
        else
        {
                *trusted = false;
-               return 0;
+               return MESSAGEPORT_ERROR_NONE;
        }
 
        return MESSAGEPORT_ERROR_INVALID_PARAMETER;

diff --git a/src/message-port.cpp b/src/message-port.cpp
index e8ece33..577fab4 100644 (file)
--- a/src/message-port.cpp
+++ b/src/message-port.cpp
@@ -111,6 +111,7 @@ messageport_send_bidirectional_message(int id, const char* remote_app_id, const
                ret = pProxy->CheckTrustedLocalPort(id, &trusted);
                if (ret < 0)
                {
+                       free(pName);
                        return MESSAGEPORT_ERROR_INVALID_PARAMETER;
                }