postgres.git / summary / log / commit / refs

commit    988f907d2437ea0b45aa0002178610bb9d8a399a
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Thu Nov 17 18:24:54 2011 +0000

    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 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++;
 


[parent: b735757c3254]