diff options
| author | Bruce Momjian | 2011-11-17 18:24:55 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2011-11-17 18:24:55 +0000 |
| commit | 379aa2f5a40c8f46911d9979f3222f8c5abc59b0 (patch) | |
| tree | 463839de25cef1330b45b3395b7695fa46a07a33 | |
| parent | 165fd3947a72eaa576c18db42fa653e17f962280 (diff) | |
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
| -rw-r--r-- | contrib/pg_upgrade/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c index 02c81a7fc4e..4983e7f5ad9 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++; |