From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 10 Aug 2012 21:14:47 +0000 (-0400)
Subject: Prevent pg_upgrade from crashing if it can't write to the current
X-Git-Tag: REL9_2_BETA4~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2af6537b5c81d9354e08896012cdd5c38bea311;p=postgresql

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

Backpatch to 9.2.
---

diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
index 1c7120471f..2c0dfd65e4 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 */