NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit39aab11

committed

Don't test already-referenced pointer for nullness

Commitb8ba734 added in PQgetResult a derefence to a pointerreturned by pqPrepareAsyncResult(), before some other code that wasalready testing that pointer for nullness. But since commit618c167 (in Postgres 15), pqPrepareAsyncResult() doesn't everreturn NULL (a statically-allocated result is returned if OOM). So inbranches 15 and up, we can remove the redundant pointer check with noharm done.However, in branch 14, pqPrepareAsyncResult() can indeed return NULL ifit runs out of memory. Fix things there by adding a null pointer checkbefore dereferencing the pointer. This should hint Coverity that thepreexisting check is not redundant but necessary.Backpatch to 14, likeb8ba734.Per Coverity.

1 parent23e0ba5 commit39aab11Copy full SHA for 39aab11

File tree

1 file changed

-1

lines changed

src/interfaces/libpq
- fe-exec.c

1 file changed

-1

lines changed

`‎src/interfaces/libpq/fe-exec.c`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -841,6 +841,8 @@ pqSaveWriteError(PGconn *conn)`
`841`	`841`	`* using whatever is in conn->errorMessage. In any case, clear the async`
`842`	`842`	`* result storage, and update our notion of how much error text has been`
`843`	`843`	`* returned to the application.`
	`844`	`+ *`
	`845`	`+ * Note that in no case (not even OOM) do we return NULL.`
`844`	`846`	`*/`
`845`	`847`	`PGresult*`
`846`	`848`	`pqPrepareAsyncResult(PGconn*conn)`
`@@ -2137,7 +2139,7 @@ PQgetResult(PGconn *conn)`
`2137`	`2139`	`* (In other words: we don't return a NULL after a pipeline`
`2138`	`2140`	`* sync.)`
`2139`	`2141`	`*/`
`2140`		`-if (res&&res->resultStatus==PGRES_PIPELINE_SYNC)`
	`2142`	`+if (res->resultStatus==PGRES_PIPELINE_SYNC)`
`2141`	`2143`	`pqPipelineProcessQueue(conn);`
`2142`	`2144`	`}`
`2143`	`2145`	`else`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit39aab11

File tree

1 file changed

1 file changed

`‎src/interfaces/libpq/fe-exec.c`

0 commit comments