Commit438467a

authored

Merge pull request#25 from MakSl/fix_hangup

[PGPRO-5172] Fixed infinite looping in the receive_msg_by_parts function

2 parents873f877 +5a9f8b2 commit438467aCopy full SHA for 438467a

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -970,19 +970,21 @@ receive_msg_by_parts(shm_mq_handle mqh, Size total, void **datap,`
`970`	`970`	`shm_mq_resultmq_receive_result;`
`971`	`971`	`shm_mq_msg*buff;`
`972`	`972`	`intoffset;`
`973`		`-int*expected;`
	`973`	`+int*expected;`
	`974`	`+intexpected_data;`
`974`	`975`	`Sizelen;`
`975`	`976`
`976`	`977`	`/* Get the expected number of bytes in message */`
`977`	`978`	`mq_receive_result=shm_mq_receive(mqh,&len, (void**)&expected,nowait);`
	`979`	`+expected_data=*expected;`
`978`	`980`	`if (mq_receive_result!=SHM_MQ_SUCCESS)`
`979`	`981`	`returnmq_receive_result;`
`980`	`982`	`Assert(len==sizeof(int));`
`981`	`983`
`982`		`-datap=palloc0(expected);`
	`984`	`+*datap=palloc0(expected_data);`
`983`	`985`
`984`	`986`	`/* Get the message itself */`
`985`		`-for (offset=0;offset<*expected; )`
	`987`	`+for (offset=0;offset<expected_data; )`
`986`	`988`	`{`
`987`	`989`	`/* Keep receiving new messages until we assemble the full message */`
`988`	`990`	`mq_receive_result=shm_mq_receive(mqh,&len, ((void**)&buff),nowait);`

Comments

(0)