summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1997-10-08 22:23:47 +0000
committerJeremy Allison <jra@samba.org>1997-10-08 22:23:47 +0000
commit10424272bebb7867d85b70ebe9aebef85fd5efe0 (patch)
tree633f5a809b163536421b7a9393894c58653bcc81
parentf40427291e176028f45482209d863019428abc8b (diff)
downloadsamba-10424272bebb7867d85b70ebe9aebef85fd5efe0.tar.gz
samba-10424272bebb7867d85b70ebe9aebef85fd5efe0.tar.bz2
samba-10424272bebb7867d85b70ebe9aebef85fd5efe0.zip
Put in fix for read-prediction extending files bug. Hard to test, can't
get read-prediction to happen :-). Jeremy (jallison@whistle.com) (This used to be commit fa69b3dda47d56e0c3ce1f4f284eac89d4b4bf56)
-rw-r--r--source3/smbd/predict.c39
1 files changed, 26 insertions, 13 deletions
diff --git a/source3/smbd/predict.c b/source3/smbd/predict.c
index 691d8fbb4e..7d6b2498f5 100644
--- a/source3/smbd/predict.c
+++ b/source3/smbd/predict.c
@@ -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;
+
+ /* 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;
- rp_predict_offset = offset + num;
- rp_predict_length = num;
+ /* 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;