sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Fix bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write

Browse Source 
Bug found and fix suggested by Andrew Bartlett.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sun Dec 25 07:46:38 CET 2011 on sn-devel-104
This commit is contained in:
Jeremy Allison 2011-12-24 21:12:09 -08:00
parent d4e834ec6c
commit eb617374a6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/lib/recvfile.c
View File

@ -214,10 +214,9 @@ ssize_t sys_recvfile(int fromfd,
}
done:
if (total_written < count) {
if (count) {
int saved_errno = errno;
if (drain_socket(fromfd, count-total_written) !=
count-total_written) {
if (drain_socket(fromfd, count) != count) {
/* socket is dead. */
return -1;
}