Fix base backup with database OIDs larger than INT32_MAX

petere · petere · commit bf65f3c8871b · 2020-01-13T13:41:09.000+01:00
The use of pg_atoi() for parsing a string into an Oid fails for values larger than INT32_MAX, since OIDs are unsigned. Instead, use atooid(). While this has less error checking, the contents of the data directory are expected to be trustworthy, so we don't need to go out of our way to do full error checking. Discussion: https://www.postgresql.org/message-id/flat/dea47fc8-6c89-a2b1-07e3-754ff1ab094b%402ndquadrant.com
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
@@ -1316,7 +1316,7 @@ sendDir(const char *path, int basepathlen, bool sizeonly, List *tablespaces,
 
 			if (!sizeonly)
 				sent = sendFile(pathbuf, pathbuf + basepathlen + 1, &statbuf,
-								true, isDbDir ? pg_atoi(lastDir + 1, sizeof(Oid), 0) : InvalidOid);
+								true, isDbDir ? atooid(lastDir + 1) : InvalidOid);
 
 			if (sent || sizeonly)
 			{

Original file line number	Diff line number	Diff line change
`@@ -1316,7 +1316,7 @@ sendDir(const char path, int basepathlen, bool sizeonly, List tablespaces,`
`1316`	`1316`
`1317`	`1317`	`if (!sizeonly)`
`1318`	`1318`	`sent = sendFile(pathbuf, pathbuf + basepathlen + 1, &statbuf,`
`1319`		`- true, isDbDir ? pg_atoi(lastDir + 1, sizeof(Oid), 0) : InvalidOid);`
	`1319`	`+ true, isDbDir ? atooid(lastDir + 1) : InvalidOid);`
`1320`	`1320`
`1321`	`1321`	`if (sent \|\| sizeonly)`
`1322`	`1322`	`{`