Fix new memory leaks in libpq

alvherre · alvherre · commit 2b526ed2e1cb · 2021-03-21T14:55:27.000-03:00
My oversight in commit 9aa491a. Per coverity.
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -1299,10 +1299,6 @@ PQsendQueryInternal(PGconn *conn, const char *query, bool newQuery)
 	if (!PQsendQueryStart(conn, newQuery))
 		return 0;
 
-	entry = pqAllocCmdQueueEntry(conn);
-	if (entry == NULL)
-		return 0;				/* error msg already set */
-
 	/* check the argument */
 	if (!query)
 	{
@@ -1311,6 +1307,10 @@ PQsendQueryInternal(PGconn *conn, const char *query, bool newQuery)
 		return 0;
 	}
 
+	entry = pqAllocCmdQueueEntry(conn);
+	if (entry == NULL)
+		return 0;				/* error msg already set */
+
 	/* Send the query message(s) */
 	if (conn->pipelineStatus == PQ_PIPELINE_OFF)
 	{
@@ -1320,6 +1320,7 @@ PQsendQueryInternal(PGconn *conn, const char *query, bool newQuery)
 			pqPutMsgEnd(conn) < 0)
 		{
 			/* error message should be set up already */
+			pqRecycleCmdQueueEntry(conn, entry);
 			return 0;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1299,10 +1299,6 @@ PQsendQueryInternal(PGconn conn, const char query, bool newQuery)`
`1299`	`1299`	`if (!PQsendQueryStart(conn, newQuery))`
`1300`	`1300`	`return 0;`
`1301`	`1301`
`1302`		`- entry = pqAllocCmdQueueEntry(conn);`
`1303`		`- if (entry == NULL)`
`1304`		`- return 0; /* error msg already set */`
`1305`		`-`
`1306`	`1302`	`/* check the argument */`
`1307`	`1303`	`if (!query)`
`1308`	`1304`	`{`
`@@ -1311,6 +1307,10 @@ PQsendQueryInternal(PGconn conn, const char query, bool newQuery)`
`1311`	`1307`	`return 0;`
`1312`	`1308`	`}`
`1313`	`1309`
	`1310`	`+ entry = pqAllocCmdQueueEntry(conn);`
	`1311`	`+ if (entry == NULL)`
	`1312`	`+ return 0; /* error msg already set */`
	`1313`	`+`
`1314`	`1314`	`/* Send the query message(s) */`
`1315`	`1315`	`if (conn->pipelineStatus == PQ_PIPELINE_OFF)`
`1316`	`1316`	`{`
`@@ -1320,6 +1320,7 @@ PQsendQueryInternal(PGconn conn, const char query, bool newQuery)`
`1320`	`1320`	`pqPutMsgEnd(conn) < 0)`
`1321`	`1321`	`{`
`1322`	`1322`	`/* error message should be set up already */`
	`1323`	`+ pqRecycleCmdQueueEntry(conn, entry);`
`1323`	`1324`	`return 0;`
`1324`	`1325`	`}`
`1325`	`1326`