postgres.git / summary / log / commit / refs

commit    85642ec00b5e0c58d2504b10c079693b8fb28cc5
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Fri Aug 10 21:14:48 2012 +0000

    Prevent pg_upgrade from crashing if it can't write to the current
    directory.
    
    Backpatch to 9.2.


 contrib/pg_upgrade/util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
index 1c7120471f8..2c0dfd65e4e 100644
--- a/contrib/pg_upgrade/util.c
+++ b/contrib/pg_upgrade/util.c
@@ -78,7 +78,8 @@ pg_log(eLogType type, char *fmt,...)
 	va_end(args);
 
 	/* PG_VERBOSE is only output in verbose mode */
-	if (type != PG_VERBOSE || log_opts.verbose)
+	/* fopen() on log_opts.internal might have failed, so check it */
+	if ((type != PG_VERBOSE || log_opts.verbose) && log_opts.internal != NULL)
 	{
 		fwrite(message, strlen(message), 1, log_opts.internal);
 		/* if we are using OVERWRITE_MESSAGE, add newline to log file */


[parent: 914b1301cc7b]