FTP: fix directory listing parser for ftp://ftp.dd-wrt.com/others/juno6/

net/ftp/ftp_directory_listing_parser_ls.cc

 // Copyright (c) 2010 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_parser_ls.h"
 
 #include <vector>
 
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 109 matching lines @@
     return true;
   }
 
   int column_offset;
   if (!DetectColumnOffset(columns, current_time_, &column_offset))
     return false;
 
   // We may receive file names containing spaces, which can make the number of
   // columns arbitrarily large. We will handle that later. For now just make
   // sure we have all the columns that should normally be there.
-  if (columns.size() < 7U + column_offset)
+  if (columns.size() < 6U + column_offset)

[wtc, 2010/10/28 01:05:41]

It would be nice to document what are the 6 columns that
should normally be there.

[Paweł Hajdan Jr., 2010/10/28 07:15:34]

Good idea, done.

     return false;
 
   if (!LooksLikeUnixPermissionsListing(columns[0]))
     return false;
 
   FtpDirectoryListingEntry entry;
   if (columns[0][0] == 'l') {
     entry.type = FtpDirectoryListingEntry::SYMLINK;
   } else if (columns[0][0] == 'd') {
     entry.type = FtpDirectoryListingEntry::DIRECTORY;
@@ skipping 17 matching lines @@
 
   if (!FtpUtil::LsDateListingToTime(columns[3 + column_offset],
                                     columns[4 + column_offset],
                                     columns[5 + column_offset],
                                     current_time_,
                                     &entry.last_modified)) {
     return false;
   }
 
   entry.name = FtpUtil::GetStringPartAfterColumns(line, 6 + column_offset);
+
+  if (entry.name.empty()) {
+    // Some FTP servers send listing entries with empty names. It's not obvious
+    // how to display such an entry, so we ignore them. We don't want to make
+    // the parsing fail at this point though. Other entries can still be useful.
+    return true;
+  }
+
   if (entry.type == FtpDirectoryListingEntry::SYMLINK) {
     string16::size_type pos = entry.name.rfind(ASCIIToUTF16(" -> "));
 
     // We don't require the " -> " to be present. Some FTP servers don't send
     // the symlink target, possibly for security reasons.
     if (pos != string16::npos)
       entry.name = entry.name.substr(0, pos);
   }
 
   entries_.push(entry);
   return true;
 }
 
 bool FtpDirectoryListingParserLs::OnEndOfInput() {
   return true;
 }
 
 bool FtpDirectoryListingParserLs::EntryAvailable() const {
   return !entries_.empty();
 }
 
 FtpDirectoryListingEntry FtpDirectoryListingParserLs::PopEntry() {
   FtpDirectoryListingEntry entry = entries_.front();
   entries_.pop();
   return entry;
 }
 
 }  // namespace net