Only try to do a graceful disconnect if we've successfully loaded the

mhagander · mhagander · commit a95d15ff5dd5 · 2010-04-13T08:16:09.000Z
shared library with the disconnect function in it. Fixes segmentation
fault reported by Jeff Davis.

Fujii Masao
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
@@ -29,7 +29,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.7 2010/03/21 00:17:58 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.8 2010/04/13 08:16:09 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -330,7 +330,8 @@ WalRcvDie(int code, Datum arg)
 	SpinLockRelease(&walrcv->mutex);
 
 	/* Terminate the connection gracefully. */
-	walrcv_disconnect();
+	if (walrcv_disconnect != NULL)
+		walrcv_disconnect();
 }
 
 /* SIGHUP: set flag to re-read config file at next convenient time */

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`*`
`30`	`30`	`*`
`31`	`31`	`* IDENTIFICATION`
`32`		`- * $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.7 2010/03/21 00:17:58 petere Exp $`
	`32`	`+ * $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.8 2010/04/13 08:16:09 mha Exp $`
`33`	`33`	`*`
`34`	`34`	`*-------------------------------------------------------------------------`
`35`	`35`	`*/`
`@@ -330,7 +330,8 @@ WalRcvDie(int code, Datum arg)`
`330`	`330`	`SpinLockRelease(&walrcv->mutex);`
`331`	`331`
`332`	`332`	`/* Terminate the connection gracefully. */`
`333`		`- walrcv_disconnect();`
	`333`	`+ if (walrcv_disconnect != NULL)`
	`334`	`+ walrcv_disconnect();`
`334`	`335`	`}`
`335`	`336`
`336`	`337`	`/* SIGHUP: set flag to re-read config file at next convenient time */`