From: Peter Eisentraut <peter@eisentraut.org>
Date: Mon, 21 Feb 2022 08:42:46 +0000 (+0100)
Subject: Fix possible null pointer reference
X-Git-Tag: REL_15_BETA1~655
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c868c92caa864d223006c095d623b8086754c6f;p=thirdparty%2Fpostgresql.git

Fix possible null pointer reference

Per Coverity.  Introduced in 37851a8b83d3d57ca48736093b10aa5f3bc0c177.
---

diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 8a332a72b12..a29fa0b3e6a 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -439,8 +439,7 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect
 			ereport(WARNING,
 					(errmsg("database \"%s\" has no actual collation version, but a version was recorded",
 							name)));
-
-		if (strcmp(actual_versionstr, collversionstr) != 0)
+		else if (strcmp(actual_versionstr, collversionstr) != 0)
 			ereport(WARNING,
 					(errmsg("database \"%s\" has a collation version mismatch",
 							name),