database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 03:21:24 +03:00
Code

Truncate strings in tarCreateHeader() with strlcpy(), not sprintf().

Browse Source 
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.
This commit is contained in:
Noah Misch 2015-06-21 20:04:36 -04:00
parent ab232db2c2
commit 926efeb042
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/replication/basebackup.c
View File

@ -1159,7 +1159,7 @@ _tarWriteHeader(const char *filename, const char *linktarget,
memset(h, 0, sizeof(h)); memset(h, 0, sizeof(h));
/* Name 100 */ /* Name 100 */
sprintf(&h[0], "%.99s", filename); strlcpy(&h[0], filename, 100);
if (linktarget != NULL || S_ISDIR(statbuf->st_mode)) if (linktarget != NULL || S_ISDIR(statbuf->st_mode))
{ {
/* /*
@ -1201,7 +1201,7 @@ _tarWriteHeader(const char *filename, const char *linktarget,
/* Type - Symbolic link */ /* Type - Symbolic link */
sprintf(&h[156], "2"); sprintf(&h[156], "2");
/* Link Name 100 */ /* Link Name 100 */
sprintf(&h[157], "%.99s", linktarget); strlcpy(&h[157], linktarget, 100);
} }
else if (S_ISDIR(statbuf->st_mode)) else if (S_ISDIR(statbuf->st_mode))
/* Type - directory */ /* Type - directory */
@ -1218,11 +1218,11 @@ _tarWriteHeader(const char *filename, const char *linktarget,
/* User 32 */ /* User 32 */
/* XXX: Do we need to care about setting correct username? */ /* XXX: Do we need to care about setting correct username? */
sprintf(&h[265], "%.31s", "postgres"); strlcpy(&h[265], "postgres", 32);
/* Group 32 */ /* Group 32 */
/* XXX: Do we need to care about setting correct group name? */ /* XXX: Do we need to care about setting correct group name? */
sprintf(&h[297], "%.31s", "postgres"); strlcpy(&h[297], "postgres", 32);
/* Major Dev 8 */ /* Major Dev 8 */
sprintf(&h[329], "%07o ", 0); sprintf(&h[329], "%07o ", 0);