[FFmpeg-cvslog] lavf/libssh: translate a read of 0 to EOF

Jan Ekström git at videolan.org
Mon May 28 20:35:18 EEST 2018


ffmpeg | branch: release/4.0 | Jan Ekström <jeebjp at gmail.com> | Mon May 28 03:21:35 2018 +0300| [c8b57d4333b1bc5c4125fdac8fbf4625c399fc9c] | committer: Jan Ekström

lavf/libssh: translate a read of 0 to EOF

Yet another case of forgotten 0 =! EOF translation.

While the documentation for this specific synchronous read
function does not mention it, the documentation for
`sftp_async_read` documents it, as well as looking at the
implementation of this function leads one to find
`if (handle->eof) { return 0; }`.

Reported by stnutt on IRC.

(cherry picked from commit 26892c7615395f331f6143535f03a2957973e2e0)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8b57d4333b1bc5c4125fdac8fbf4625c399fc9c
---

 libavformat/libssh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/libssh.c b/libavformat/libssh.c
index 9e3d4da45e..21474f0f0a 100644
--- a/libavformat/libssh.c
+++ b/libavformat/libssh.c
@@ -295,7 +295,7 @@ static int libssh_read(URLContext *h, unsigned char *buf, int size)
         av_log(libssh, AV_LOG_ERROR, "Read error.\n");
         return AVERROR(EIO);
     }
-    return bytes_read;
+    return bytes_read ? bytes_read : AVERROR_EOF;
 }
 
 static int libssh_write(URLContext *h, const unsigned char *buf, int size)



More information about the ffmpeg-cvslog mailing list