From 379aa2f5a40c8f46911d9979f3222f8c5abc59b0 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 17 Nov 2011 13:24:55 -0500 Subject: [PATCH] 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 --- contrib/pg_upgrade/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c index 02c81a7fc4..4983e7f5ad 100644 --- 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++; -- 2.39.5