Don't attempt to write recovery.conf when -R is not specified

mhagander · mhagander · commit b5ed1376c61b · 2013-01-09T16:57:32.000+01:00
Fixes segmentation fault during regular use.

Fujii Masao
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1084,7 +1084,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 	if (copybuf != NULL)
 		PQfreemem(copybuf);
 
-	if (basetablespace)
+	if (basetablespace && writerecoveryconf)
 		WriteRecoveryConf();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1084,7 +1084,7 @@ ReceiveAndUnpackTarFile(PGconn conn, PGresult res, int rownum)`
`1084`	`1084`	`if (copybuf != NULL)`
`1085`	`1085`	`PQfreemem(copybuf);`
`1086`	`1086`
`1087`		`- if (basetablespace)`
	`1087`	`+ if (basetablespace && writerecoveryconf)`
`1088`	`1088`	`WriteRecoveryConf();`
`1089`	`1089`	`}`
`1090`	`1090`