pgpool2.git / summary / log / commit / refs

commit    e0750f4805fbec9bee4b6997c5e95243d9cebcbf
Author:   Muhammad Usama <m.usama@gmail.com>
Date:     Thu Feb 19 09:13:47 2015 +0000

    Fixing a bug left by PCP overhauling patch, where the wrong argument was being passed to sizeof().
    Thanks coverty scan for catching this.


 src/libs/pcp/pcp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/pcp/pcp.c b/src/libs/pcp/pcp.c
index 24543bcea..eb90894a5 100644
--- a/src/libs/pcp/pcp.c
+++ b/src/libs/pcp/pcp.c
@@ -217,7 +217,7 @@ process_salt_info_response(PCPConnInfo* pcpConn, char* buf, int len)
 {
 	char* salt = palloc((sizeof(char) * 4));
 	memcpy(salt, buf, 4);
-	if (setNextResultBinaryData(pcpConn->pcpResInfo, (void *)salt, sizeof(salt) , NULL) < 0 )
+	if (setNextResultBinaryData(pcpConn->pcpResInfo, (void *)salt, 4, NULL) < 0 )
 	{
 		pcp_internal_error(pcpConn,
 						   "command failed. invalid response\n");
@@ -809,7 +809,7 @@ process_process_info_response(PCPConnInfo* pcpConn, char* buf, int len)
 		if(PCPResultStatus(pcpConn->pcpResInfo) != PCP_RES_INCOMPLETE)
 			goto INVALID_RESPONSE;
 
-		processInfo = palloc0(sizeof(processInfo));
+		processInfo = palloc0(sizeof(ProcessInfo));
 		processInfo->connection_info = palloc0(sizeof(ConnectionInfo));
 
 		index = (char *) memchr(buf, '\0', len) + 1;
@@ -876,7 +876,7 @@ process_process_info_response(PCPConnInfo* pcpConn, char* buf, int len)
 			goto INVALID_RESPONSE;
 
 		processInfo->connection_info->connected = atoi(index);
-		if (setNextResultBinaryData(pcpConn->pcpResInfo, (void *)processInfo, sizeof(processInfo), free_processInfo) < 0)
+		if (setNextResultBinaryData(pcpConn->pcpResInfo, (void *)processInfo, sizeof(ProcessInfo), free_processInfo) < 0)
 			goto INVALID_RESPONSE;
 
 		return;


[parent: 7765322c7401]