pg_upgrade: fix off-by-one mistake in snprintf

alvherre · alvherre · commit 9e26326ad6cd · 2012-06-28T23:37:27.000-04:00
snprintf counts trailing NUL towards the char limit.  Failing to account
for that was causing an invalid value to be passed to pg_resetxlog -l,
aborting the upgrade process.
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
@@ -425,7 +425,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 	{
 		if (got_log_id && got_log_seg)
 		{
-			snprintf(cluster->controldata.nextxlogfile, 24, "%08X%08X%08X",
+			snprintf(cluster->controldata.nextxlogfile, 25, "%08X%08X%08X",
 					 tli, logid, segno);
 			got_nextxlogfile = true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`425`	`425`	`{`
`426`	`426`	`if (got_log_id && got_log_seg)`
`427`	`427`	`{`
`428`		`- snprintf(cluster->controldata.nextxlogfile, 24, "%08X%08X%08X",`
	`428`	`+ snprintf(cluster->controldata.nextxlogfile, 25, "%08X%08X%08X",`
`429`	`429`	`tli, logid, segno);`
`430`	`430`	`got_nextxlogfile = true;`
`431`	`431`	`}`