Commite890ce7

committed

Remove unneeded null pointer checks before PQfreemem()

PQfreemem() just calls free(), and the latter already checks for nullpointers.Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://www.postgresql.org/message-id/flat/cf26e970-8e92-59f1-247a-aa265235075b%40enterprisedb.com

1 parent45987aa commite890ce7Copy full SHA for e890ce7

File tree

-16

lines changed

contrib/vacuumlo
- vacuumlo.c
src
- backend/replication/libpqwalreceiver
  - libpqwalreceiver.c
- bin/pg_basebackup
  - receivelog.c

-16

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -231,12 +231,9 @@ vacuumlo(const char database, const struct _param param)`
`231`	`231`	`pg_log_error("%s",PQerrorMessage(conn));`
`232`	`232`	`PQclear(res);`
`233`	`233`	`PQfinish(conn);`
`234`		`-if (schema!=NULL)`
`235`		`-PQfreemem(schema);`
`236`		`-if (table!=NULL)`
`237`		`-PQfreemem(table);`
`238`		`-if (field!=NULL)`
`239`		`-PQfreemem(field);`
	`234`	`+PQfreemem(schema);`
	`235`	`+PQfreemem(table);`
	`236`	`+PQfreemem(field);`
`240`	`237`	`return-1;`
`241`	`238`	`}`
`242`	`239`

Lines changed: 2 additions & 4 deletions

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`	`intrawlen;`
`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 */`

Lines changed: 3 additions & 6 deletions

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`	`returnNULL;`
`864`	`863`	`}`
`865`	`864`
`@@ -940,8 +939,7 @@ CopyStreamReceive(PGconn *conn, long timeout, pgsocket stop_socket,`
`940`	`939`	`char*copybuf=NULL;`
`941`	`940`	`intrawlen;`
`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`	`returnres;`
`1211`	`1208`	`}`

Comments

(0)