Handle PQresultErrorField(PG_DIAG_SQLSTATE) returning NULL in streamutil.c.

anarazel · anarazel · commit 7685963eeb16 · 2015-08-12T17:35:50.000+02:00
In ff27db5 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 ff27db5
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,9 @@ CreateReplicationSlot(PGconn conn, const char slot_name, const char *plugin,`
`340`	`340`	`{`
`341`	`341`	`const char *sqlstate = PQresultErrorField(res, PG_DIAG_SQLSTATE);`
`342`	`342`
`343`		`- if (slot_exists_ok && strcmp(sqlstate, ERRCODE_DUPLICATE_OBJECT) == 0)`
	`343`	`+ if (slot_exists_ok &&`
	`344`	`+ sqlstate &&`
	`345`	`+ strcmp(sqlstate, ERRCODE_DUPLICATE_OBJECT) == 0)`
`344`	`346`	`{`
`345`	`347`	`destroyPQExpBuffer(query);`
`346`	`348`	`PQclear(res);`