postgres.git / summary / log / commit / refs

commit    5c868c92caa864d223006c095d623b8086754c6f
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Mon Feb 21 08:42:46 2022 +0000
First released in: 15.0

    Fix possible null pointer reference
    
    Per Coverity.  Introduced in 37851a8b83d3d57ca48736093b10aa5f3bc0c177.


 src/backend/utils/init/postinit.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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),


[parent: bf4ed12b5820]