postgres.git / summary / log / commit / refs

commit    2e6f6f3abe6fd249cc8a4d5eb194295ac3988b19
Author:   Andres Freund <andres@anarazel.de>
Date:     Wed Aug 12 15:09:35 2015 +0000

    Handle PQresultErrorField(PG_DIAG_SQLSTATE) returning NULL in streamutil.c.
    
    In ff27db5d I missed that PQresultErrorField() may return NULL if
    there's no sqlstate associated with an error.
    
    Spotted-By: Coverity
    Reported-By: Michael Paquier
    Discussion: CAB7nPqQ3o10SY6NVdU4pjq85GQTN5tbbkq2gnNUh2fBNU3rKyQ@mail.gmail.com
    Backpatch: 9.5, like ff27db5d


 src/bin/pg_basebackup/streamutil.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index 91f919c34cd..2c963b67a32 100644
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -340,7 +340,9 @@ CreateReplicationSlot(PGconn *conn, const char *slot_name, const char *plugin,
 	{
 		const char *sqlstate = PQresultErrorField(res, PG_DIAG_SQLSTATE);
 
-		if (slot_exists_ok && strcmp(sqlstate, ERRCODE_DUPLICATE_OBJECT) == 0)
+		if (slot_exists_ok &&
+			sqlstate &&
+			strcmp(sqlstate, ERRCODE_DUPLICATE_OBJECT) == 0)
 		{
 			destroyPQExpBuffer(query);
 			PQclear(res);


[parent: 43a8ed26c97e]