Fix FTP directory listings for servers which use \n as the line break.

webkit/glue/ftp_directory_listing_response_delegate.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 "webkit/glue/ftp_directory_listing_response_delegate.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 45 matching lines @@
   if (!CodepageToUTF16(raw_filename, encoding.c_str(),
                        OnStringUtilConversionError::SUBSTITUTE, &filename))
     filename = WideToUTF16Hack(base::SysNativeMBToWide(raw_filename));
   return filename;
 }
 
 void ExtractFullLinesFromBuffer(std::string* buffer,
                                 std::vector<std::string>* lines) {
   int cut_pos = 0;
   for (size_t i = 0; i < buffer->length(); i++) {
-    if (i >= 1 && (*buffer)[i - 1] == '\r' && (*buffer)[i] == '\n') {
-      lines->push_back(buffer->substr(cut_pos, i - cut_pos - 1));
-      cut_pos = i + 1;
-    }
+    if ((*buffer)[i] != '\n')
+      continue;
+    size_t line_length = i - cut_pos;
+    if (line_length > 0 && (*buffer)[i - 1] == '\r')
+      line_length--;
+    lines->push_back(buffer->substr(cut_pos, line_length));
+    cut_pos = i + 1;
   }
   buffer->erase(0, cut_pos);
 }
 
 void LogFtpServerType(char server_type) {
   switch (server_type) {
     case 'E':
       net::UpdateFtpServerTypeHistograms(net::SERVER_EPLF);
       break;
     case 'V':
@@ skipping 164 matching lines @@
 
 void FtpDirectoryListingResponseDelegate::SendResponseBufferToClient() {
   if (!response_buffer_.empty()) {
     client_->didReceiveData(loader_, response_buffer_.data(),
                             response_buffer_.length(), -1);
     response_buffer_.clear();
   }
 }
 
 }  // namespace webkit_glue