Fix recognizing FTP listings consisting of only one line.

net/ftp/ftp_directory_listing_buffer.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "net/ftp/ftp_directory_listing_buffer.h"
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
@@ skipping 52 matching lines @@
 }
 
 int FtpDirectoryListingBuffer::ProcessRemainingData() {
   int rv = ExtractFullLinesFromBuffer();
   if (rv != OK)
     return rv;
 
   if (!buffer_.empty())
     return ERR_INVALID_RESPONSE;
 
-  return ParseLines();
+  rv = ParseLines();
+  if (rv != OK)
+    return rv;
+
+  rv = OnEndOfInput();
+  if (rv != OK)
+    return rv;
+
+  DCHECK(current_parser_);
+  return OK;
 }
 
 bool FtpDirectoryListingBuffer::EntryAvailable() const {
   return (current_parser_ ? current_parser_->EntryAvailable() : false);
 }
 
 FtpDirectoryListingEntry FtpDirectoryListingBuffer::PopEntry() {
   DCHECK(EntryAvailable());
   return current_parser_->PopEntry();
 }
@@ skipping 55 matching lines @@
       if (parsers_.empty())
         return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT;
       if (parsers_.size() == 1)
         current_parser_ = *parsers_.begin();
     }
   }
 
   return OK;
 }
 
+int FtpDirectoryListingBuffer::OnEndOfInput() {
+  ParserSet::iterator i = parsers_.begin();
+  while (i != parsers_.end()) {
+    if ((*i)->OnEndOfInput()) {
+      i++;
+    } else {
+      delete *i;
+      parsers_.erase(i++);
+    }
+  }
+
+  if (parsers_.size() != 1) {
+    current_parser_ = NULL;
+    return ERR_UNRECOGNIZED_FTP_DIRECTORY_LISTING_FORMAT;
+  }
+
+  current_parser_ = *parsers_.begin();
+  return OK;
+}
+
 }  // namespace net