projects
/
postgresql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1494b7
)
pg_upgrade: fix off-by-one mistake in snprintf
author
Alvaro Herrera
Fri, 29 Jun 2012 03:37:27 +0000
(23:37 -0400)
committer
Alvaro Herrera
Fri, 29 Jun 2012 03:37:27 +0000
(23:37 -0400)
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.
contrib/pg_upgrade/controldata.c
patch
|
blob
|
blame
|
history
diff --git
a/contrib/pg_upgrade/controldata.c
b/contrib/pg_upgrade/controldata.c
index 5d5ab854ca8323d726359d9edfa52d162d8b2e65..7da19c6c28bd7f1990a5be51f355096993acf87f 100644
(file)
--- 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, 2
4
, "%08X%08X%08X",
+ snprintf(cluster->controldata.nextxlogfile, 2
5
, "%08X%08X%08X",
tli, logid, segno);
got_nextxlogfile = true;
}