Remove unneeded null pointer checks before PQfreemem()

petere · petere · commit e890ce7a4feb · 2022-08-26T19:16:28.000+02:00
PQfreemem() just calls free(), and the latter already checks for null pointers. Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://www.postgresql.org/message-id/flat/cf26e970-8e92-59f1-247a-aa265235075b%40enterprisedb.com
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
@@ -231,12 +231,9 @@ vacuumlo(const char *database, const struct _param *param)
 			pg_log_error("%s", PQerrorMessage(conn));
 			PQclear(res);
 			PQfinish(conn);
-			if (schema != NULL)
-				PQfreemem(schema);
-			if (table != NULL)
-				PQfreemem(table);
-			if (field != NULL)
-				PQfreemem(field);
+			PQfreemem(schema);
+			PQfreemem(table);
+			PQfreemem(field);
 			return -1;
 		}
 
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -741,8 +741,7 @@ static void
 libpqrcv_disconnect(WalReceiverConn *conn)
 {
 	PQfinish(conn->streamConn);
-	if (conn->recvBuf != NULL)
-		PQfreemem(conn->recvBuf);
+	PQfreemem(conn->recvBuf);
 	pfree(conn);
 }
 
@@ -768,8 +767,7 @@ libpqrcv_receive(WalReceiverConn *conn, char **buffer,
 {
 	int			rawlen;
 
-	if (conn->recvBuf != NULL)
-		PQfreemem(conn->recvBuf);
+	PQfreemem(conn->recvBuf);
 	conn->recvBuf = NULL;
 
 	/* Try to receive a CopyData message */
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -858,8 +858,7 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream,
 	}
 
 error:
-	if (copybuf != NULL)
-		PQfreemem(copybuf);
+	PQfreemem(copybuf);
 	return NULL;
 }
 
@@ -940,8 +939,7 @@ CopyStreamReceive(PGconn *conn, long timeout, pgsocket stop_socket,
 	char	   *copybuf = NULL;
 	int			rawlen;
 
-	if (*buffer != NULL)
-		PQfreemem(*buffer);
+	PQfreemem(*buffer);
 	*buffer = NULL;
 
 	/* Try to receive a CopyData message */
@@ -1204,8 +1202,7 @@ HandleEndOfCopyStream(PGconn *conn, StreamCtl *stream, char *copybuf,
 		}
 		still_sending = false;
 	}
-	if (copybuf != NULL)
-		PQfreemem(copybuf);
+	PQfreemem(copybuf);
 	*stoppos = blockpos;
 	return res;
 }

Original file line number	Diff line number	Diff line change
`@@ -741,8 +741,7 @@ static void`
`741`	`741`	`libpqrcv_disconnect(WalReceiverConn *conn)`
`742`	`742`	`{`
`743`	`743`	`PQfinish(conn->streamConn);`
`744`		`- if (conn->recvBuf != NULL)`
`745`		`- PQfreemem(conn->recvBuf);`
	`744`	`+ PQfreemem(conn->recvBuf);`
`746`	`745`	`pfree(conn);`
`747`	`746`	`}`
`748`	`747`
`@@ -768,8 +767,7 @@ libpqrcv_receive(WalReceiverConn conn, char *buffer,`
`768`	`767`	`{`
`769`	`768`	`int rawlen;`
`770`	`769`
`771`		`- if (conn->recvBuf != NULL)`
`772`		`- PQfreemem(conn->recvBuf);`
	`770`	`+ PQfreemem(conn->recvBuf);`
`773`	`771`	`conn->recvBuf = NULL;`
`774`	`772`
`775`	`773`	`/* Try to receive a CopyData message */`
Original file line number	Diff line number	Diff line change
`@@ -858,8 +858,7 @@ HandleCopyStream(PGconn conn, StreamCtl stream,`
`858`	`858`	`}`
`859`	`859`
`860`	`860`	`error:`
`861`		`- if (copybuf != NULL)`
`862`		`- PQfreemem(copybuf);`
	`861`	`+ PQfreemem(copybuf);`
`863`	`862`	`return NULL;`
`864`	`863`	`}`
`865`	`864`
`@@ -940,8 +939,7 @@ CopyStreamReceive(PGconn *conn, long timeout, pgsocket stop_socket,`
`940`	`939`	`char *copybuf = NULL;`
`941`	`940`	`int rawlen;`
`942`	`941`
`943`		`- if (*buffer != NULL)`
`944`		`- PQfreemem(*buffer);`
	`942`	`+ PQfreemem(*buffer);`
`945`	`943`	`*buffer = NULL;`
`946`	`944`
`947`	`945`	`/* Try to receive a CopyData message */`
`@@ -1204,8 +1202,7 @@ HandleEndOfCopyStream(PGconn conn, StreamCtl stream, char *copybuf,`
`1204`	`1202`	`}`
`1205`	`1203`	`still_sending = false;`
`1206`	`1204`	`}`
`1207`		`- if (copybuf != NULL)`
`1208`		`- PQfreemem(copybuf);`
	`1205`	`+ PQfreemem(copybuf);`
`1209`	`1206`	`*stoppos = blockpos;`
`1210`	`1207`	`return res;`
`1211`	`1208`	`}`