From 981791bd45b0a784be79661b45eba2a537cea2fe Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 25 Jun 1996 04:15:41 +0000 Subject: [PATCH] fixed a bug where unmap could be called with a NULL buffer --- rsync.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rsync.c b/rsync.c index 66e42a3a..b8653535 100644 --- a/rsync.c +++ b/rsync.c @@ -486,8 +486,9 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) char *buf; int i; - if (verbose > 2) + if (verbose > 2) { fprintf(stderr,"recv_files(%d) starting\n",flist->count); + } if (recurse && delete_mode && !local_name && flist->count>0) { delete_files(flist); @@ -560,7 +561,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) /* recv file data */ receive_data(f_in,buf,fd2,fname); - if (fd1 != -1) close(fd1); + if (fd1 != -1) { + unmap_file(buf,st.st_size); + close(fd1); + } close(fd2); if (verbose > 2) @@ -583,8 +587,6 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) cleanup_fname = NULL; - unmap_file(buf,st.st_size); - set_perms(fname,&flist->files[i],NULL,0); } -- 2.34.1