fix: explicitly handle CRLF newlines when parse file list

deniskovalchuk · Sep 22, 2023 · 8aa8f17 · 8aa8f17
1 parent be8788b
commit 8aa8f17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/file_list_reply.cpp b/src/file_list_reply.cpp
@@ -57,6 +57,10 @@ std::vector<std::string> file_list_reply::parse_file_list(const std::string & fi
     std::string line;
     while (std::getline(iss, line))
     {
+        /* Handle CRLF. */
+        if (!line.empty() && line.back() == '\r')
+            line.pop_back();
+
         file_list.push_back(line);
     }
 

diff --git a/test/client.cpp b/test/client.cpp
@@ -774,8 +774,6 @@ TEST_F(client, get_file_list_only_names)
                                                        "230 Login successful.",
                                                        "200 Type set to: Binary."));
 
-    client.set_transfer_type(ftp::transfer_type::ascii);
-
     ftp::file_list_reply reply = client.get_file_list(".", true);
     check_last_reply(reply, "226 Transfer complete.");
     ASSERT_THAT(reply.get_file_list(), ElementsAre());