From: Sunwook Bae <sunwook45.bae@samsung.com>
Date: Mon, 26 Aug 2013 11:35:39 +0000 (+0900)
Subject: Fix a memory leak in Deserializer
X-Git-Tag: accepted/tizen/20130912.102759~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ede588f9b04dc32f109f73f47fa02c5cf56a6a7e;p=platform%2Fcore%2Fappfw%2Fmessage-port.git

Fix a memory leak in Deserializer

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

diff --git a/src/IpcClient.cpp b/src/IpcClient.cpp
index fbe6df5..8c06900 100644
--- a/src/IpcClient.cpp
+++ b/src/IpcClient.cpp
@@ -261,6 +261,7 @@ IpcClient::MakeConnection(bool forReverse)
 	ret = write(client, &helloMessage, sizeof(helloMessage));
 	if (ret < 0)
 	{
+		_LOGE("Failed to send a hello message: %d, %s", errno, strerror(errno));
 		goto CATCH;
 	}
 
@@ -497,8 +498,16 @@ IpcClient::SendAsync(IPC::Message* pMessage)
 int
 IpcClient::SendSync(IPC::Message* pMessage)
 {
+	int error = MESSAGEPORT_ERROR_NONE;
+	int ret = 0;
+
+	int readSize = 0;
+	char buffer[1024];
+	char* pEndOfMessage = NULL;
+
+	std::string message;
+
 	IPC::Message* pReply = NULL;
-	MessageReplyDeserializer* pReplyDeserializer = NULL;
 	IPC::SyncMessage* pSyncMessage = dynamic_cast <IPC::SyncMessage*>(pMessage);
 	if (pSyncMessage == NULL)
 	{
@@ -506,12 +515,15 @@ IpcClient::SendSync(IPC::Message* pMessage)
 		return MESSAGEPORT_ERROR_IO_ERROR;
 	}
 
+	MessageReplyDeserializer* pReplyDeserializer = pSyncMessage->GetReplyDeserializer();
 	int messageId = SyncMessage::GetMessageId(*pSyncMessage);
 
 	int fd = AcquireFd();
 	if (fd < 0)
 	{
 		_LOGE("Failed to get fd.");
+
+		delete pReplyDeserializer;
 		return MESSAGEPORT_ERROR_IO_ERROR;
 	}
 
@@ -526,8 +538,8 @@ IpcClient::SendSync(IPC::Message* pMessage)
 		{
 			_LOGE("Failed to send a request: %d, %s", errno, strerror(errno));
 
-			ReleaseFd(fd);
-			return MESSAGEPORT_ERROR_IO_ERROR;
+			error = MESSAGEPORT_ERROR_IO_ERROR;
+			goto CATCH;
 		}
 
 		remain -= written;
@@ -541,13 +553,6 @@ IpcClient::SendSync(IPC::Message* pMessage)
 	pfd.events = POLLIN | POLLRDHUP;
 	pfd.revents = 0;
 
-	char buffer[1024];
-	std::string message;
-	int readSize = 0;
-	char* pEndOfMessage = NULL;
-
-	int ret = 0;
-
 	while (true)
 	{
 		ret = poll(&pfd, 1, -1);
@@ -560,16 +565,16 @@ IpcClient::SendSync(IPC::Message* pMessage)
 
 			_LOGE("Failed to poll (%d, %s).", errno, strerror(errno));
 
-			ReleaseFd(fd);
-			return MESSAGEPORT_ERROR_IO_ERROR;
+			error = MESSAGEPORT_ERROR_IO_ERROR;
+			goto CATCH;
 		}
 
 		if (pfd.revents & POLLRDHUP)
 		{
 			_LOGE("POLLRDHUP");
 
-			ReleaseFd(fd);
-			return MESSAGEPORT_ERROR_IO_ERROR;
+			error = MESSAGEPORT_ERROR_IO_ERROR;
+			goto CATCH;
 		}
 
 		if (pfd.revents & POLLIN)
@@ -590,23 +595,23 @@ IpcClient::SendSync(IPC::Message* pMessage)
 			{
 				_LOGE("The memory is insufficient.");
 
-				ReleaseFd(fd);
-				return MESSAGEPORT_ERROR_OUT_OF_MEMORY;
+				error = MESSAGEPORT_ERROR_OUT_OF_MEMORY;
+				goto CATCH;
 			}
 
 			break;
 		}
 	}
 
-	pReplyDeserializer = pSyncMessage->GetReplyDeserializer();
 	pReplyDeserializer->SerializeOutputParameters(*pReply);
-
 	delete pReply;
+
+CATCH:
 	delete pReplyDeserializer;
 
 	ReleaseFd(fd);
 
-	return MESSAGEPORT_ERROR_NONE;
+	return error;
 }
 
 int