projects / ffmpeg.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d58a15a)
avformat/ftp: Check for Telnet IAC characters and other non printable ASCII chars
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 19 May 2026 20:05:29 +0000 (22:05 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 18 Jun 2026 18:30:56 +0000 (20:30 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 090838497ccecb017e8ffd304dcef4b3ca929fa6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/ftp.c patch | blob | history

diff --git a/libavformat/ftp.c b/libavformat/ftp.c
index 54482b897fed4272093c74193de830e1418ef034..fc769c9d74d59e5509caf4df9c22c4b54ebd8eee 100644 (file)
--- a/libavformat/ftp.c
+++ b/libavformat/ftp.c
@@ -100,6 +100,16 @@ static const AVClass ftp_context_class = {
 
 static int ftp_close(URLContext *h);
 
+static int is_bad_string(const unsigned char *s)
+{
+    while(*s) {
+        if (*s < 0x20 || *s == 0x7F || *s == 0xFF)
+            return 1;
+        s++;
+    }
+    return 0;
+}
+
 static int ftp_getc(FTPContext *s)
 {
     int len;
@@ -250,7 +260,7 @@ static int ftp_auth(FTPContext *s)
     static const int user_codes[] = {331, 230, 0};
     static const int pass_codes[] = {230, 0};
 
-    if (strpbrk(s->user, "\r\n"))
+    if (is_bad_string(s->user))
         return AVERROR(EINVAL);
     err = snprintf(buf, sizeof(buf), "USER %s\r\n", s->user);
     if (err >= sizeof(buf))
@@ -259,7 +269,7 @@ static int ftp_auth(FTPContext *s)
     err = ftp_send_command(s, buf, user_codes, NULL);
     if (err == 331) {
         if (s->password) {
-            if (strpbrk(s->password, "\r\n"))
+            if (is_bad_string(s->password))
                 return AVERROR(EINVAL);
             err = snprintf(buf, sizeof(buf), "PASS %s\r\n", s->password);
             if (err >= sizeof(buf))
@@ -746,8 +756,8 @@ static int ftp_connect(URLContext *h, const char *url)
     av_free(s->path);
     s->path = newpath;
 
-    if (strpbrk(s->path, "\r\n")) {
-        av_log(h, AV_LOG_ERROR, "Path contains CR/LF characters\n");
+    if (is_bad_string(s->path)) {
+        av_log(h, AV_LOG_ERROR, "Path contains non-printable characters\n");
         return AVERROR(EINVAL);
     }
 
FFmpeg git repo