From 6697f85b5053e36a880f725ea87d1fbba5ee0563 Mon Sep 17 00:00:00 2001 From: Jeremy Cross Date: Mon, 25 Jul 2016 22:55:04 +0000 Subject: [PATCH] sftp: ensure sftp_packet_read recognizes channel EOF to avoid infinite loop Signed-off-by: Jeremy Cross Reviewed-by: Andreas Schneider (cherry picked from commit dbf72ffba2ad5b5694cd55aa1a7ca99053d20386) --- src/sftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sftp.c b/src/sftp.c index 6bcd8a69..fa2d3f44 100644 --- a/src/sftp.c +++ b/src/sftp.c @@ -334,7 +334,7 @@ sftp_packet sftp_packet_read(sftp_session sftp) { do { // read from channel until 4 bytes have been read or an error occurs s=ssh_channel_read(sftp->channel, buffer+r, 4-r, 0); - if (s < 0) { + if (s <= 0) { ssh_buffer_free(packet->payload); SAFE_FREE(packet); return NULL;