Landing again: "Make FTP directory parser less strict"

net/ftp/ftp_directory_listing_parser.cc

 // Copyright (c) 2011 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.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 10 matching lines @@
 namespace net {
 
 namespace {
 
 // Fills in |raw_name| for all |entries| using |encoding|. Returns network
 // error code.
 int FillInRawName(const std::string& encoding,
                   std::vector<FtpDirectoryListingEntry>* entries) {
   for (size_t i = 0; i < entries->size(); i++) {
     if (!base::UTF16ToCodepage(entries->at(i).name, encoding.c_str(),
-                               base::OnStringConversionError::FAIL,
+                               base::OnStringConversionError::SUBSTITUTE,
                                &entries->at(i).raw_name)) {
       return ERR_ENCODING_CONVERSION_FAILED;
     }
   }
 
   return OK;
 }
 
 // Parses |text| as an FTP directory listing. Fills in |entries|
 // and |server_type| and returns network error code.
@@ skipping 42 matching lines @@
                    const base::Time& current_time,
                    std::vector<FtpDirectoryListingEntry>* entries,
                    FtpServerType* server_type) {
   std::string encoding;
   if (!base::DetectEncoding(text, &encoding))
     return ERR_ENCODING_DETECTION_FAILED;
   const char* encoding_name = encoding.c_str();
 
   base::string16 converted_text;
   if (base::CodepageToUTF16(text, encoding_name,
-                            base::OnStringConversionError::FAIL,
+                            base::OnStringConversionError::SUBSTITUTE,
                             &converted_text)) {
     const char* const kNewlineSeparators[] = {"\n", "\r\n"};
 
     for (size_t j = 0; j < arraysize(kNewlineSeparators); j++) {
       int rv = ParseListing(converted_text,
                             base::ASCIIToUTF16(kNewlineSeparators[j]),
                             encoding_name, current_time, entries, server_type);
       if (rv == OK)
         return rv;
     }
@@ skipping 14 matching lines @@
 int ParseFtpDirectoryListing(const std::string& text,
                              const base::Time& current_time,
                              std::vector<FtpDirectoryListingEntry>* entries) {
   FtpServerType server_type = SERVER_UNKNOWN;
   int rv = DecodeAndParse(text, current_time, entries, &server_type);
   UpdateFtpServerTypeHistograms(server_type);
   return rv;
 }
 
 }  // namespace net