Attachment #881526 for bug #921432

View | Details | Raw Unified | Return to bug 921432
Collapse All | Expand All




#if 1
    if (f->state == ok && !f->remaining_) {
        fznotify1(sftp_io_nextbuf, 0);
        char *s = priority_read();
        if (s[1] == '-') {
            f->state = error;
            return -1;

            f->state = eof;
        }
        else {
            char *p = s + 1;
            f->buffer_ = f->memory_ + next_int(&p);
            f->remaining_ = (int)next_int(&p);
        }
        sfree((void *)s);
    }
    if (f->state == eof) {
        return 0;

Return to bug 921432

Lines 211-217 int read_from_file(RFile f, void buffer, int length) Link Here

(-)a/src/putty/unix/uxsftp.c (-3 / +3 lines)
211	#if 1	211	#if 1
212	if (f->state == ok && !f->remaining_) {	212	if (f->state == ok && !f->remaining_) {
213	fznotify1(sftp_io_nextbuf, 0);	213	fznotify1(sftp_io_nextbuf, 0);
214	char const* s = priority_read();	214	char *s = priority_read();
215	if (s[1] == '-') {	215	if (s[1] == '-') {
216	f->state = error;	216	f->state = error;
217	return -1;	217	return -1;
Lines 220-230 int read_from_file(RFile f, void buffer, int length) Link Here
220	f->state = eof;	220	f->state = eof;
221	}	221	}
222	else {	222	else {
223	char const* p = s + 1;	223	char *p = s + 1;
224	f->buffer_ = f->memory_ + next_int(&p);	224	f->buffer_ = f->memory_ + next_int(&p);
225	f->remaining_ = (int)next_int(&p);	225	f->remaining_ = (int)next_int(&p);
226	}	226	}
227	sfree(s);	227	sfree((void *)s);
228	}	228	}
229	if (f->state == eof) {	229	if (f->state == eof) {
230	return 0;	230	return 0;