Hang if directory listing size is > 8k

net/ftp/ftp_network_transaction.cc

 // Copyright (c) 2008 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_network_transaction.h"
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/net_errors.h"
@@ skipping 70 matching lines @@
     CompletionCallback* callback) {
   return ERR_FAILED;
 }
 
 int FtpNetworkTransaction::Read(IOBuffer* buf,
                                 int buf_len,
                                 CompletionCallback* callback) {
   DCHECK(buf);
   DCHECK(buf_len > 0);
 
-  if (data_socket_ == NULL)
-    return 0;  // Data socket closed, no more data left.
-
-  if (!data_socket_->IsConnected())
-    return 0;  // Data socket disconnected, no more data left.
-
   read_data_buf_ = buf;
-  read_data_buf_len_ = buf_len;
-
+  // Always read one byte less than the size, because if data is directory
+  // listing then we must have a null terminating string.
+  read_data_buf_len_ = buf_len - 1;
   next_state_ = STATE_DATA_READ;
 
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING)
     user_callback_ = callback;
-  else if (rv == 0)
-    data_socket_->Disconnect();
   return rv;
 }
 
 const FtpResponseInfo* FtpNetworkTransaction::GetResponseInfo() const {
   return &response_;
 }
 
 LoadState FtpNetworkTransaction::GetLoadState() const {
   return LOAD_STATE_IDLE;
 }
@@ skipping 671 matching lines @@
 // LIST command
 int FtpNetworkTransaction::DoCtrlWriteLIST() {
   std::string command = "LIST";
   next_state_ = STATE_CTRL_READ;
   return SendFtpCommand(command, COMMAND_LIST);
 }
 
 int FtpNetworkTransaction::ProcessResponseLIST(int response_code) {
   switch (GetErrorClass(response_code)) {
     case ERROR_CLASS_INITIATED:
+      response_.is_directory_listing = true;
       response_message_buf_len_ = 0;  // Clear the responce buffer.
-      next_state_ = STATE_CTRL_READ;
       break;
     case ERROR_CLASS_OK:
       response_.is_directory_listing = true;
       next_state_ = STATE_CTRL_WRITE_QUIT;
       break;
     case ERROR_CLASS_PENDING:
       return Stop(ERR_FAILED);
     case ERROR_CLASS_ERROR_RETRY:
       return Stop(ERR_FAILED);
     case ERROR_CLASS_ERROR:
@@ skipping 48 matching lines @@
 int FtpNetworkTransaction::DoDataConnectComplete(int result) {
   if (retr_failed_) {
     next_state_ = STATE_CTRL_WRITE_CWD;
   } else {
     next_state_ = STATE_CTRL_WRITE_SIZE;
   }
   return OK;
 }
 
 int FtpNetworkTransaction::DoDataRead() {
+  if (data_socket_ == NULL || !data_socket_->IsConnected())
+    return Stop(OK);  // No more data so send QUIT Command now and wait for response.
+
   DCHECK(read_data_buf_);
   DCHECK(read_data_buf_len_ > 0);
 
   next_state_ = STATE_DATA_READ_COMPLETE;
   read_data_buf_->data()[0] = 0;
   return data_socket_->Read(read_data_buf_, read_data_buf_len_,
                             &io_callback_);
 }
 
 int FtpNetworkTransaction::DoDataReadComplete(int result) {
-  DLOG(INFO) << read_data_buf_->data();  // The read_data_buf_ is NULL
-                                         // terminated string.
   return result;
 }
 
 }  // namespace net