mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-10 02:16:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix directory-length overflow bug (7057).

Browse Source
This commit is contained in:
Wayne Davison
2010-03-26 16:56:40 -07:00
parent 54f00c3f89
commit 2ecd8b7cd2
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
flist.c
View File

@@ -1640,21 +1640,29 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
}
p = fbuf + len;
if (len != 1 || *fbuf != '/')
if (len == 1 && *fbuf == '/')
remainder = MAXPATHLEN - 1;
else if (len < MAXPATHLEN-1) {
*p++ = '/';
*p = '\0';
remainder = MAXPATHLEN - (p - fbuf);
*p = '\0';
remainder = MAXPATHLEN - (len + 1);
} else
remainder = 0;
for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
char *dname = d_name(di);
if (dname[0] == '.' && (dname[1] == '\0'
|| (dname[1] == '.' && dname[2] == '\0')))
continue;
if (strlcpy(p, dname, remainder) >= remainder) {
unsigned name_len = strlcpy(p, dname, remainder);
if (name_len >= remainder) {
char save = fbuf[len];
fbuf[len] = '\0';
io_error |= IOERR_GENERAL;
rprintf(FERROR_XFER,
"cannot send long-named file %s\n",
full_fname(fbuf));
"filename overflows max-path len by %u: %s/%s\n",
name_len - remainder + 1, fbuf, dname);
fbuf[len] = save;
continue;
}
if (dname[0] == '\0') {