From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 17 Nov 2011 18:24:54 +0000 (-0500)
Subject: Fix pg_upgrade's pg_scandir_internal() to properly handle a NULL
X-Git-Tag: REL9_2_BETA1~817
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=988f907d2437ea0b45aa0002178610bb9d8a399a;p=postgresql.git

Fix pg_upgrade's pg_scandir_internal() to properly handle a NULL
pattern, which is used on PG 9.1 and HEAD (but not pre-9.1).  Fixes
crash on Windows.

Backpatched to 9.1.

Reported by Mark Dilger
---

diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c
index c7b6f5cbfa3..d3b0eaf2e28 100644
--- a/contrib/pg_upgrade/file.c
+++ b/contrib/pg_upgrade/file.c
@@ -296,7 +296,7 @@ pg_scandir_internal(const char *dirname,
 	while ((direntry = readdir(dirdesc)) != NULL)
 	{
 		/* Invoke the selector function to see if the direntry matches */
-		if ((*selector) (direntry))
+		if (selector && (*selector) (direntry))
 		{
 			count++;