database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Don't test already-referenced pointer for nullness

Browse Source 
Commit b8ba7344e9eb 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 commit
618c16707a6d (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, like b8ba7344e9eb.

Per Coverity.
This commit is contained in:
Alvaro Herrera 2024-01-16 12:27:52 +01:00
parent c7edaeec50
commit 7a7c8c98a6
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/libpq/fe-exec.c
View File

@ -2091,8 +2091,9 @@ PQgetResult(PGconn *conn)
res = pqPrepareAsyncResult(conn);
/* Advance the queue as appropriate */
pqCommandQueueAdvance(conn, false,
res->resultStatus == PGRES_PIPELINE_SYNC);
if (res)
pqCommandQueueAdvance(conn, false,
res->resultStatus == PGRES_PIPELINE_SYNC);
if (conn->pipelineStatus != PQ_PIPELINE_OFF)
{