sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

Put in fix for read-prediction extending files bug. Hard to test, can't

Browse Source 
get read-prediction to happen :-).
Jeremy (jallison@whistle.com)
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent d7f41e3815
commit fa69b3dda4
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/smbd/predict.c
View File

@ -53,24 +53,37 @@ int read_predict(int fd,int offset,char *buf,char **ptr,int num)
offset >= rp_offset &&
possible>0 &&
smb_last_time-rp_time < rp_timeout)
{
ret = possible;
if (buf)
memcpy(buf,rp_buffer + (offset-rp_offset),possible);
else
*ptr = rp_buffer + (offset-rp_offset);
DEBUG(5,("read-prediction gave %d bytes of %d\n",ret,num));
}
{
ret = possible;
if (buf)
memcpy(buf,rp_buffer + (offset-rp_offset),possible);
else
*ptr = rp_buffer + (offset-rp_offset);
DEBUG(5,("read-prediction gave %d bytes of %d\n",ret,num));
}
if (ret == num) {
predict_skip = True;
} else {
predict_skip = False;
struct stat rp_stat;
/* prepare the next prediction */
rp_predict_fd = fd;
rp_predict_offset = offset + num;
rp_predict_length = num;
/* Find the end of the file - ensure we don't
read predict beyond it. */
if(fstat(fd,&rp_stat) < 0)
{
DEBUG(0,("read-prediction failed on fstat. Error was %s\n", strerror(errno)));
predict_skip = True;
}
else
{
predict_skip = False;
/* prepare the next prediction */
rp_predict_fd = fd;
/* Make sure we don't seek beyond the end of the file. */
rp_predict_offset = MIN((offset + num),rp_stat.st_size);
rp_predict_length = num;
}
}
if (ret < 0) ret = 0;