diff options
| author | Noah Misch <noah@leadboat.com> | 2015-06-21 20:04:36 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2015-06-21 20:05:27 -0400 |
| commit | 926efeb042f64083e127b165ac98752dfccbff1f (patch) | |
| tree | 13464ff518c89712d4a43e8a92edea3efff03f5f | |
| parent | ab232db2c2ce3e58ded053f351cef4773523f498 (diff) | |
Truncate strings in tarCreateHeader() with strlcpy(), not sprintf().
This supplements the GNU libc bug #6530 workarounds introduced in commit
54cd4f04576833abc394e131288bf3dd7dcf4806. On affected systems, a
tar-format pg_basebackup failed when some filename beneath the data
directory was not valid character data in the postmaster/walsender
locale. Back-patch to 9.1, where pg_basebackup was introduced. Extant,
bug-prone conversion specifications receive only ASCII bytes or involve
low-importance messages.
| -rw-r--r-- | src/backend/replication/basebackup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index 896ab6917a6..0e5f070bdfc 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -1159,7 +1159,7 @@ _tarWriteHeader(const char *filename, const char *linktarget, memset(h, 0, sizeof(h)); /* Name 100 */ - sprintf(&h[0], "%.99s", filename); + strlcpy(&h[0], filename, 100); if (linktarget != NULL || S_ISDIR(statbuf->st_mode)) { /* @@ -1201,7 +1201,7 @@ _tarWriteHeader(const char *filename, const char *linktarget, /* Type - Symbolic link */ sprintf(&h[156], "2"); /* Link Name 100 */ - sprintf(&h[157], "%.99s", linktarget); + strlcpy(&h[157], linktarget, 100); } else if (S_ISDIR(statbuf->st_mode)) /* Type - directory */ @@ -1218,11 +1218,11 @@ _tarWriteHeader(const char *filename, const char *linktarget, /* User 32 */ /* XXX: Do we need to care about setting correct username? */ - sprintf(&h[265], "%.31s", "postgres"); + strlcpy(&h[265], "postgres", 32); /* Group 32 */ /* XXX: Do we need to care about setting correct group name? */ - sprintf(&h[297], "%.31s", "postgres"); + strlcpy(&h[297], "postgres", 32); /* Major Dev 8 */ sprintf(&h[329], "%07o ", 0); |