summaryrefslogtreecommitdiff
path: root/cleanup.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-10-14 02:29:29 +0000
committerWayne Davison <wayned@samba.org>2006-10-14 02:29:29 +0000
commit2356d73bb400176c957a575fd8f0344d882427b9 (patch)
treebc6339e135b44ef541532c0d777db504d361f927 /cleanup.c
parent4968423e71c5bec901a7ccbc91930d7aae030f20 (diff)
downloadrsync-2356d73bb400176c957a575fd8f0344d882427b9.tar.gz
rsync-2356d73bb400176c957a575fd8f0344d882427b9.tar.bz2
rsync-2356d73bb400176c957a575fd8f0344d882427b9.zip
The cleanup code that handles moving the temp file to the partial
file needed to check that cleanup_fname was not NULL to prevent any possibility of a recursion starting into that code again.
Diffstat (limited to 'cleanup.c')
-rw-r--r--cleanup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cleanup.c b/cleanup.c
index f1ee321d..2f47ef7f 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -117,8 +117,8 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
}
}
- if (cleanup_got_literal && cleanup_new_fname && keep_partial
- && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
+ if (cleanup_got_literal && cleanup_fname && cleanup_new_fname
+ && keep_partial && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
char *fname = cleanup_fname;
cleanup_fname = NULL;
if (cleanup_fd_r != -1)