Add unknown file size handling in ComplexFormDataBytesConsumer

third_party/WebKit/Source/modules/fetch/FormDataBytesConsumer.cpp

 // Copyright 2016 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 "modules/fetch/FormDataBytesConsumer.h"
 
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "modules/fetch/BlobBytesConsumer.h"
 #include "platform/blob/BlobData.h"
@@ skipping 100 matching lines @@
       m_blobBytesConsumer = consumer;
       return;
     }
 
     std::unique_ptr<BlobData> blobData = BlobData::create();
     for (const auto& element : m_formData->elements()) {
       switch (element.m_type) {
         case FormDataElement::data:
           blobData->appendBytes(element.m_data.data(), element.m_data.size());
           break;
-        case FormDataElement::encodedFile:
+        case FormDataElement::encodedFile: {
+          auto fileLength = element.m_fileLength;
+          if (fileLength < 0) {
+            if (!getFileSize(element.m_filename, fileLength)) {
+              m_formData = nullptr;
+              m_blobBytesConsumer = BytesConsumer::createErrored(
+                  Error("Cannot determine a file size"));
+              return;
+            }
+          }
           blobData->appendFile(element.m_filename, element.m_fileStart,
-                               element.m_fileLength,
+                               fileLength,
                                element.m_expectedFileModificationTime);
           break;
+        }
         case FormDataElement::encodedBlob:
           if (element.m_optionalBlobDataHandle)
             blobData->appendBlob(element.m_optionalBlobDataHandle, 0,
                                  element.m_optionalBlobDataHandle->size());
           break;
-        case FormDataElement::encodedFileSystemURL:
-          blobData->appendFileSystemURL(
-              element.m_fileSystemURL, element.m_fileStart,
-              element.m_fileLength, element.m_expectedFileModificationTime);
+        case FormDataElement::encodedFileSystemURL: {
+          auto fileLength = element.m_fileLength;
+          if (fileLength < 0) {
+            if (!getFileSize(element.m_filename, fileLength)) {

[hiroshige, 2017/03/02 20:38:21]

m_filename is not valid for encodedFileSystemURL.
(Thus test coverage not sufficient?)

[yhirano, 2017/03/23 06:18:06]

Thanks, you're right.
I talked with tzik@, and it seems we cannot test the feature. So I decided not
to support the feature for now.

+              m_formData = nullptr;
+              m_blobBytesConsumer = BytesConsumer::createErrored(
+                  Error("Cannot determine a file size"));
+              return;
+            }
+          }
+          blobData->appendFileSystemURL(element.m_fileSystemURL,
+                                        element.m_fileStart, fileLength,
+                                        element.m_expectedFileModificationTime);
           break;
       }

[hiroshige, 2017/03/02 20:38:21]

nit: +2 indent. (Perhaps this is git cl format bug?)

[yhirano, 2017/03/23 06:18:06]

Removed

+      }
     }
     // Here we handle m_formData->boundary() as a C-style string. See
     // FormDataEncoder::generateUniqueBoundaryString.
     blobData->setContentType(AtomicString("multipart/form-data; boundary=") +
                              m_formData->boundary().data());
     auto size = blobData->length();
     m_blobBytesConsumer = new BlobBytesConsumer(
         executionContext, BlobDataHandle::create(std::move(blobData), size));
   }
 
@@ skipping 73 matching lines @@
     BytesConsumer* consumer)
     : m_impl(isSimple(formData.get())
                  ? static_cast<BytesConsumer*>(
                        new SimpleFormDataBytesConsumer(std::move(formData)))
                  : static_cast<BytesConsumer*>(
                        new ComplexFormDataBytesConsumer(executionContext,
                                                         std::move(formData),
                                                         consumer))) {}
 
 }  // namespace blink