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

bmomjian · bmomjian · commit 85642ec00b5e · 2012-08-10T17:14:48.000-04:00
directory.

Backpatch to 9.2.
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ pg_log(eLogType type, char *fmt,...)`
`78`	`78`	`va_end(args);`
`79`	`79`
`80`	`80`	`/* PG_VERBOSE is only output in verbose mode */`
`81`		`- if (type != PG_VERBOSE \|\| log_opts.verbose)`
	`81`	`+ /* fopen() on log_opts.internal might have failed, so check it */`
	`82`	`+ if ((type != PG_VERBOSE \|\| log_opts.verbose) && log_opts.internal != NULL)`
`82`	`83`	`{`
`83`	`84`	`fwrite(message, strlen(message), 1, log_opts.internal);`
`84`	`85`	`/* if we are using OVERWRITE_MESSAGE, add newline to log file */`