Fix pg_upgrade's pg_scandir_internal() to properly handle a NULL

bmomjian · bmomjian · commit 379aa2f5a40c · 2011-11-17T13:24:55.000-05:00
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
@@ -294,7 +294,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++;
 

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ pg_scandir_internal(const char *dirname,`
`294`	`294`	`while ((direntry = readdir(dirdesc)) != NULL)`
`295`	`295`	`{`
`296`	`296`	`/* Invoke the selector function to see if the direntry matches */`
`297`		`- if ((*selector) (direntry))`
	`297`	`+ if (selector && (*selector) (direntry))`
`298`	`298`	`{`
`299`	`299`	`count++;`
`300`	`300`