Make the WebURLLoaderClients in the pepper code destroy (or have some guard) the loader in didFail()

content/renderer/pepper/pepper_plugin_instance_impl.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/pepper_plugin_instance_impl.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 381 matching lines @@
        ++it) {
     document_loader->didReceiveData(
         NULL, it->c_str(), it->length(), 0 /* encoded_data_length */);
   }
   if (finished_loading_) {
     document_loader->didFinishLoading(
         NULL,
         0 /* finish_time */,
         blink::WebURLLoaderClient::kUnknownEncodedDataLength);
   }
   if (error_.get()) {

[hiroshige, 2015/08/03 07:25:17]

Changing this |if| into |else if| might be better to ensure at most only one of
didFinishLoading() or didFail() is called here.

[tyoshino (SeeGerritForStatus), 2015/08/03 07:59:05]

Done.

     document_loader->didFail(NULL, *error_);
   }
 }
 
 void PepperPluginInstanceImpl::ExternalDocumentLoader::didReceiveData(
     WebURLLoader* loader,
     const char* data,
     int data_length,
     int encoded_data_length) {
   data_.push_back(std::string(data, data_length));
 }
 
 void PepperPluginInstanceImpl::ExternalDocumentLoader::didFinishLoading(
     WebURLLoader* loader,
     double finish_time,
     int64_t total_encoded_data_length) {
   DCHECK(!finished_loading_);
+
+  if (error_.get())
+    return;
+
   finished_loading_ = true;
 }
 
 void PepperPluginInstanceImpl::ExternalDocumentLoader::didFail(
     WebURLLoader* loader,
     const WebURLError& error) {
   DCHECK(!error_.get());

[hiroshige, 2015/08/03 07:25:17]

Should we also add if(finished_loading_) return; here in didFail()?

[tyoshino (SeeGerritForStatus), 2015/08/03 07:59:05]

Done.

   error_.reset(new WebURLError(error));
 }
 
 PepperPluginInstanceImpl::GamepadImpl::GamepadImpl()
     : Resource(ppapi::Resource::Untracked()) {}
 
 PepperPluginInstanceImpl::GamepadImpl::~GamepadImpl() {}
 
 PPB_Gamepad_API* PepperPluginInstanceImpl::GamepadImpl::AsPPB_Gamepad_API() {
   return this;
@@ skipping 2825 matching lines @@
 
 void PepperPluginInstanceImpl::RecordFlashJavaScriptUse() {
   if (initialized_ && !javascript_used_ && is_flash_plugin_) {
     javascript_used_ = true;
     RenderThread::Get()->RecordAction(
         base::UserMetricsAction("Flash.JavaScriptUsed"));
   }
 }
 
 }  // namespace content