Assert(PqCommReadingMsg) in pq_peekbyte().

nmisch · nmisch · commit a7a4adcf8d1e · 2015-02-06T23:14:27.000-05:00
Interrupting pq_recvbuf() can break protocol sync, so its callers all
deserve this assertion.  The one pq_peekbyte() caller suffices already.
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -928,6 +928,8 @@ pq_getbyte(void)
 int
 pq_peekbyte(void)
 {
+	Assert(PqCommReadingMsg);
+
 	while (PqRecvPointer >= PqRecvLength)
 	{
 		if (pq_recvbuf())		/* If nothing in buffer, then recv some */

Original file line number	Diff line number	Diff line change
`@@ -928,6 +928,8 @@ pq_getbyte(void)`
`928`	`928`	`int`
`929`	`929`	`pq_peekbyte(void)`
`930`	`930`	`{`
	`931`	`+ Assert(PqCommReadingMsg);`
	`932`	`+`
`931`	`933`	`while (PqRecvPointer >= PqRecvLength)`
`932`	`934`	`{`
`933`	`935`	`if (pq_recvbuf()) /* If nothing in buffer, then recv some */`