diff options
| -rw-r--r-- | net/data/ftp/dir-listing-ls-17 | 1 | ||||
| -rw-r--r-- | net/data/ftp/dir-listing-ls-17.expected | 0 | ||||
| -rw-r--r-- | net/ftp/ftp_directory_listing_buffer.cc | 2 | ||||
| -rw-r--r-- | net/ftp/ftp_directory_listing_buffer_unittest.cc | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/net/data/ftp/dir-listing-ls-17 b/net/data/ftp/dir-listing-ls-17 new file mode 100644 index 0000000..c07fbf3 --- /dev/null +++ b/net/data/ftp/dir-listing-ls-17 @@ -0,0 +1 @@ +ftpd-BSD: .: Permission denied diff --git a/net/data/ftp/dir-listing-ls-17.expected b/net/data/ftp/dir-listing-ls-17.expected new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/net/data/ftp/dir-listing-ls-17.expected diff --git a/net/ftp/ftp_directory_listing_buffer.cc b/net/ftp/ftp_directory_listing_buffer.cc index 41daeb4..8399f13 100644 --- a/net/ftp/ftp_directory_listing_buffer.cc +++ b/net/ftp/ftp_directory_listing_buffer.cc @@ -149,7 +149,7 @@ int FtpDirectoryListingBuffer::OnEndOfInput() { } if (parsers_.size() != 1) { - DCHECK(!current_parser_); + current_parser_ = NULL; // We may hit an ambiguity in case of listings which have no entries. That's // fine, as long as all remaining parsers agree that the listing is empty. diff --git a/net/ftp/ftp_directory_listing_buffer_unittest.cc b/net/ftp/ftp_directory_listing_buffer_unittest.cc index d9708d5..c3c55d0 100644 --- a/net/ftp/ftp_directory_listing_buffer_unittest.cc +++ b/net/ftp/ftp_directory_listing_buffer_unittest.cc @@ -35,6 +35,7 @@ TEST(FtpDirectoryListingBufferTest, Parse) { "dir-listing-ls-14", "dir-listing-ls-15", "dir-listing-ls-16", + "dir-listing-ls-17", "dir-listing-mlsd-1", "dir-listing-mlsd-2", "dir-listing-netware-1", |