fix uninitialized memory access in dmq-sender

kelvich · kelvich · commit 497566d8f210 · 2019-01-17T15:44:29.000+03:00
diff --git a/src/dmq.c b/src/dmq.c
@@ -516,8 +516,11 @@ dmq_sender_main(Datum main_arg)
 
 			for (conn_id = 0; conn_id < DMQ_MAX_DESTINATIONS; conn_id++)
 			{
+				if (!conns[conn_id].active)
+					continue;
+
 				/* Idle --> Connecting */
-				if (conns[conn_id].active && conns[conn_id].state == Idle)
+				if (conns[conn_id].state == Idle)
 				{
 					double		pqtime;
 
@@ -577,6 +580,8 @@ dmq_sender_main(Datum main_arg)
 		{
 			uintptr_t conn_id = (uintptr_t) event.user_data;
 
+			Assert(conns[conn_id].active);
+
 			switch (conns[conn_id].state)
 			{
 				case Idle:

Original file line number	Diff line number	Diff line change
`@@ -516,8 +516,11 @@ dmq_sender_main(Datum main_arg)`
`516`	`516`
`517`	`517`	`for (conn_id = 0; conn_id < DMQ_MAX_DESTINATIONS; conn_id++)`
`518`	`518`	`{`
	`519`	`+ if (!conns[conn_id].active)`
	`520`	`+ continue;`
	`521`	`+`
`519`	`522`	`/* Idle --> Connecting */`
`520`		`- if (conns[conn_id].active && conns[conn_id].state == Idle)`
	`523`	`+ if (conns[conn_id].state == Idle)`
`521`	`524`	`{`
`522`	`525`	`double pqtime;`
`523`	`526`
`@@ -577,6 +580,8 @@ dmq_sender_main(Datum main_arg)`
`577`	`580`	`{`
`578`	`581`	`uintptr_t conn_id = (uintptr_t) event.user_data;`
`579`	`582`
	`583`	`+ Assert(conns[conn_id].active);`
	`584`	`+`
`580`	`585`	`switch (conns[conn_id].state)`
`581`	`586`	`{`
`582`	`587`	`case Idle:`