ThreadableLoader::cancel should be called before loader destruction

third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

 /*
  * Copyright (C) 2010 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/loader/ThreadableLoader.h"
 #include "core/streams/Stream.h"
 #include "platform/blob/BlobRegistry.h"
 #include "platform/blob/BlobURL.h"
+#include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/StringBuilder.h"
 #include <memory>
@@ skipping 11 matching lines @@
     , m_totalBytes(-1)
     , m_hasRange(false)
     , m_rangeStart(0)
     , m_rangeEnd(0)
     , m_errorCode(FileError::OK)
 {
 }
 
 FileReaderLoader::~FileReaderLoader()
 {
-    terminate();
+    cleanup();
     if (!m_urlForReading.isEmpty()) {
         if (m_urlForReadingIsStream)
             BlobRegistry::unregisterStreamURL(m_urlForReading);
         else
             BlobRegistry::revokePublicBlobURL(m_urlForReading);
     }
 }
 
 void FileReaderLoader::startInternal(ExecutionContext& executionContext, const Stream* stream, PassRefPtr<BlobDataHandle> blobData)
 {
@@ skipping 58 matching lines @@
         m_rangeEnd = readSize - 1; // End is inclusive so (0,0) is a 1-byte read.
     }
 
     m_urlForReadingIsStream = true;
     startInternal(*executionContext, &stream, nullptr);
 }
 
 void FileReaderLoader::cancel()
 {
     m_errorCode = FileError::ABORT_ERR;
-    terminate();
-}
-
-void FileReaderLoader::terminate()
-{
-    if (m_loader) {
-        m_loader->cancel();
-        cleanup();
-    }
+    cleanup();
 }
 
 void FileReaderLoader::cleanup()
 {
-    m_loader = nullptr;
+    if (m_loader) {
+        m_loader->cancel();
+        m_loader = nullptr;
+    }
 
     // If we get any error, we do not need to keep a buffer around.
     if (m_errorCode) {
         m_rawData.reset();
         m_stringResult = "";
         m_isRawDataConverted = true;
         m_decoder.reset();
     }
 }
 
@@ skipping 96 matching lines @@
         m_totalBytes = m_bytesLoaded;
     }
 
     m_finishedLoading = true;
 
     cleanup();
     if (m_client)
         m_client->didFinishLoading();
 }
 
-void FileReaderLoader::didFail(const ResourceError&)
+void FileReaderLoader::didFail(const ResourceError& error)
 {
+    if (error.isCancellation())
+        return;
     // If we're aborting, do not proceed with normal error handling since it is covered in aborting code.
     if (m_errorCode == FileError::ABORT_ERR)
         return;
 
     failed(FileError::NOT_READABLE_ERR);
 }
 
 void FileReaderLoader::failed(FileError::ErrorCode errorCode)
 {
     m_errorCode = errorCode;
@@ skipping 108 matching lines @@
     m_stringResult = builder.toString();
 }
 
 void FileReaderLoader::setEncoding(const String& encoding)
 {
     if (!encoding.isEmpty())
         m_encoding = WTF::TextEncoding(encoding);
 }
 
 } // namespace blink