Merge branch 'PGPROEE9_6_MULTIMASTER' of https://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6_MULTIMASTER

knizhnik · knizhnik · commit 42117f0019cb · 2017-02-23T13:45:53.000+03:00
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -3895,6 +3895,7 @@ BackendStartup(Port *port)
 	 */
 	if (!pg_strong_random(&MyCancelKey, sizeof(MyCancelKey)))
 	{
+		free(bn);
 		ereport(LOG,
 				(errmsg("could not generate random query cancel key")));
 		return STATUS_ERROR;
@@ -5549,6 +5550,7 @@ assign_backendlist_entry(RegisteredBgWorker *rw)
 	 */
 	if (!pg_strong_random(&MyCancelKey, sizeof(MyCancelKey)))
 	{
+		free(bn);
 		rw->rw_crashed_at = GetCurrentTimestamp();
 		return false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -3895,6 +3895,7 @@ BackendStartup(Port *port)`
`3895`	`3895`	`*/`
`3896`	`3896`	`if (!pg_strong_random(&MyCancelKey, sizeof(MyCancelKey)))`
`3897`	`3897`	`{`
	`3898`	`+ free(bn);`
`3898`	`3899`	`ereport(LOG,`
`3899`	`3900`	`(errmsg("could not generate random query cancel key")));`
`3900`	`3901`	`return STATUS_ERROR;`
`@@ -5549,6 +5550,7 @@ assign_backendlist_entry(RegisteredBgWorker *rw)`
`5549`	`5550`	`*/`
`5550`	`5551`	`if (!pg_strong_random(&MyCancelKey, sizeof(MyCancelKey)))`
`5551`	`5552`	`{`
	`5553`	`+ free(bn);`
`5552`	`5554`	`rw->rw_crashed_at = GetCurrentTimestamp();`
`5553`	`5555`	`return false;`
`5554`	`5556`	`}`