Merge pull request #25 from MakSl/fix_hangup

dlepikhova · web-flow · commit 438467aeba26 · 2021-06-24T11:42:04.000+05:00
[PGPRO-5172] Fixed infinite looping in the receive_msg_by_parts function
diff --git a/pg_query_state.c b/pg_query_state.c
@@ -970,19 +970,21 @@ receive_msg_by_parts(shm_mq_handle *mqh, Size *total, void **datap,
 	shm_mq_result mq_receive_result;
 	shm_mq_msg	*buff;
 	int			offset;
-	int		   *expected;
+	int			*expected;
+	int			expected_data;
 	Size		len;
 
 	/* Get the expected number of bytes in message */
 	mq_receive_result = shm_mq_receive(mqh, &len, (void **) &expected, nowait);
+	expected_data = *expected;
 	if (mq_receive_result != SHM_MQ_SUCCESS)
 		return mq_receive_result;
 	Assert(len == sizeof(int));
 
-	*datap = palloc0(*expected);
+	*datap = palloc0(expected_data);
 
 	/* Get the message itself */
-	for (offset = 0; offset < *expected; )
+	for (offset = 0; offset < expected_data; )
 	{
 		/* Keep receiving new messages until we assemble the full message */
 		mq_receive_result = shm_mq_receive(mqh, &len, ((void **) &buff), nowait);
