[FFmpeg-cvslog] avformat/libssh: check the user provided a password before trying to use it

James Almer git at videolan.org
Thu Jan 11 15:45:19 EET 2018


ffmpeg | branch: release/3.3 | James Almer <jamrial at gmail.com> | Sun Jun 11 14:17:30 2017 -0300| [f85b102c8011bcccaa938f76c43287afb6e4832a] | committer: James Almer

avformat/libssh: check the user provided a password before trying to use it

Fixes ticket #6413

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 8ddb6820bd52df6ed616abc3d8be200b126aa8c1)

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

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

diff --git a/libavformat/libssh.c b/libavformat/libssh.c
index 49e92e7516..9e3d4da45e 100644
--- a/libavformat/libssh.c
+++ b/libavformat/libssh.c
@@ -103,7 +103,7 @@ static av_cold int libssh_authentication(LIBSSHContext *libssh, const char *user
         }
     }
 
-    if (!authorized && (auth_methods & SSH_AUTH_METHOD_PASSWORD)) {
+    if (!authorized && password && (auth_methods & SSH_AUTH_METHOD_PASSWORD)) {
         if (ssh_userauth_password(libssh->session, NULL, password) == SSH_AUTH_SUCCESS) {
             av_log(libssh, AV_LOG_DEBUG, "Authentication successful with password.\n");
             authorized = 1;



More information about the ffmpeg-cvslog mailing list