From 7ff38c14a97e701a9ab521a3730b014c3647b14e Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Tue, 21 Oct 2008 07:10:25 +0000 Subject: Fixed some problems with SFTP range support to fix test cases 634 through 637. --- lib/ssh.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/ssh.c b/lib/ssh.c index 005eb265f..19b685f30 100644 --- a/lib/ssh.c +++ b/lib/ssh.c @@ -1644,11 +1644,21 @@ static CURLcode ssh_statemach_act(struct connectdata *conn) while(ptr && *ptr && (isspace((int)*ptr) || (*ptr=='-'))) ptr++; to=curlx_strtoofft(ptr, &ptr2, 0); - if ((ptr == ptr2) /* no "to" value given */ - || (to > size)) { - to = size; + if((ptr == ptr2) /* no "to" value given */ + || (to >= size)) { + to = size - 1; } - if (from > to) { + if(from < 0) { + /* from is relative to end of file */ + from += size; + } + if(from >= size) { + failf(data, "Offset (%" + FORMAT_OFF_T ") was beyond file size (%" FORMAT_OFF_T ")", + from, attrs.filesize); + return CURLE_BAD_DOWNLOAD_RESUME; + } + if(from > to) { from = to; size = 0; } -- cgit v1.2.3