From: Peter Eisentraut <peter@eisentraut.org>
Date: Mon, 13 Jan 2020 12:27:39 +0000 (+0100)
Subject: Fix base backup with database OIDs larger than INT32_MAX
X-Git-Tag: REL_13_BETA1~880
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=259bbe177808986e5d226ea7ce5a1ebb74657791;p=thirdparty%2Fpostgresql.git

Fix base backup with database OIDs larger than INT32_MAX

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
index 1423e6cd1f8..dea8aab45e0 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -1291,7 +1291,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)
 			{