Don't test already-referenced pointer for nullness
Commitb8ba7344e9
added in PQgetResult a derefence to a pointer returned by pqPrepareAsyncResult(), before some other code that was already testing that pointer for nullness. But since commit618c16707a
(in Postgres 15), pqPrepareAsyncResult() doesn't ever return NULL (a statically-allocated result is returned if OOM). So in branches 15 and up, we can remove the redundant pointer check with no harm done. However, in branch 14, pqPrepareAsyncResult() can indeed return NULL if it runs out of memory. Fix things there by adding a null pointer check before dereferencing the pointer. This should hint Coverity that the preexisting check is not redundant but necessary. Backpatch to 14, likeb8ba7344e9
. Per Coverity.
This commit is contained in:
parent
a37bb7c139
commit
c6605c1bdf
|
@ -842,6 +842,8 @@ pqSaveWriteError(PGconn *conn)
|
|||
* using whatever is in conn->errorMessage. In any case, clear the async
|
||||
* result storage, and update our notion of how much error text has been
|
||||
* returned to the application.
|
||||
*
|
||||
* Note that in no case (not even OOM) do we return NULL.
|
||||
*/
|
||||
PGresult *
|
||||
pqPrepareAsyncResult(PGconn *conn)
|
||||
|
@ -2138,7 +2140,7 @@ PQgetResult(PGconn *conn)
|
|||
* (In other words: we don't return a NULL after a pipeline
|
||||
* sync.)
|
||||
*/
|
||||
if (res && res->resultStatus == PGRES_PIPELINE_SYNC)
|
||||
if (res->resultStatus == PGRES_PIPELINE_SYNC)
|
||||
pqPipelineProcessQueue(conn);
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue