Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f478079
)
Call the new die_on_unsafe_path() function in a couple spots.
author
Wayne Davison
<wayned@samba.org>
Fri, 5 May 2006 05:56:37 +0000
(
05:56
+0000)
committer
Wayne Davison
<wayned@samba.org>
Fri, 5 May 2006 05:56:37 +0000
(
05:56
+0000)
flist.c
patch
|
blob
|
blame
|
history
diff --git
a/flist.c
b/flist.c
index
3c6cb4c
..
b4de31c
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-1069,6
+1069,8
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
io_start_buffering_out();
if (filesfrom_fd >= 0) {
io_start_buffering_out();
if (filesfrom_fd >= 0) {
+ if (sanitize_paths)
+ die_on_unsafe_path(argv[0], 0);
if (argv[0] && !push_dir(argv[0])) {
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
if (argv[0] && !push_dir(argv[0])) {
rsyserr(FERROR, errno, "push_dir %s failed",
full_fname(argv[0]));
@@
-1122,6
+1124,8
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
&& (len == 1 || fbuf[len-2] == '/');
}
&& (len == 1 || fbuf[len-2] == '/');
}
+ if (sanitize_paths)
+ die_on_unsafe_path(fbuf, 1);
if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",