Issue 1092005

src/trusted/plugin/srpc/closure.cc

 /*
  * Copyright 2008 The Native Client 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 <string.h>
 #include <string>
+#include <list>
 
 #include "native_client/src/shared/npruntime/npmodule.h"
 #include "native_client/src/shared/platform/nacl_host_desc.h"
 
 #include "native_client/src/trusted/desc/nacl_desc_invalid.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/plugin/srpc/npapi_native.h"
 #include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
 
 #include "native_client/src/trusted/plugin/origin.h"
 #include "native_client/src/trusted/plugin/srpc/closure.h"
 #include "native_client/src/trusted/plugin/srpc/desc_based_handle.h"
 #include "native_client/src/trusted/plugin/srpc/shared_memory.h"
 #include "native_client/src/trusted/plugin/srpc/srpc.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 
 struct NPObject;
 
 namespace nacl_srpc {
 
 bool Closure::StartDownload() {
   dprintf(("StartDownload plugin_identifier_=%p, url_=%s, this=%p\n",
            reinterpret_cast<void*>(plugin_identifier_),
            url_.c_str(),
            reinterpret_cast<void*>(this)));
   NPError err = NPN_GetURLNotify(plugin_identifier_, url_.c_str(), NULL, this);
   return (NPERR_NO_ERROR == err);
 }
 
-LoadNaClAppNotify::LoadNaClAppNotify(Plugin* plugin, std::string url)
-    : Closure(plugin, url) {
-  dprintf(("LoadNaClAppNotify ctor\n"));
+LoadNaClAppNotify::LoadNaClAppNotify(Plugin* plugin,
+                                     const std::list<std::string>& urls)
+    : Closure(plugin, urls.front()),
+      fallback_urls_(urls) {
+  fallback_urls_.pop_front();
+  dprintf(("LoadNaClAppNotify ctor (trying URL %s + %d more)\n",
+           url().c_str(), fallback_urls_.size()));
 }
 
 LoadNaClAppNotify::~LoadNaClAppNotify() {
   dprintf(("LoadNaClAppNotify dtor\n"));
 }
 
 void LoadNaClAppNotify::Run(NPStream* stream, const char* fname) {
   dprintf(("LoadNaClAppNotify Run %p, %s\n",
            static_cast<void*>(stream),
            fname));
   if (NULL != fname) {
+    assert(stream != NULL);
     plugin()->Load(stream->url, fname);
+  } else {
+    // Loading failed.  Try another URL if we have one.
+    if (fallback_urls_.size() > 0) {
+      LoadNaClAppNotify* callback =
+          new(std::nothrow) LoadNaClAppNotify(plugin(), fallback_urls_);
+      if ((NULL == callback) || (!callback->StartDownload())) {
+        dprintf(("Failed to load URL to local file.\n"));
+        // callback is always deleted in URLNotify
+        // FIXME(adonovan): it is?  even when StartDownload failed?
+        // FIXME(adonovan): shouldn't this result in the onfail handler
+        // getting called?
+      }
+    }
   }
 }
 
 void LoadNaClAppNotify::Run(const char *url,
                             const void* buffer,
                             int32_t size) {
   dprintf(("LoadNaClAppNotify Run %s, %p, %x\n", url, buffer, size));
   if (NULL != buffer) {
     plugin()->Load(url, url, buffer, size);
   }
 }
 
-
 UrlAsNaClDescNotify::UrlAsNaClDescNotify(Plugin* plugin,
                                          std::string url,
                                          void* callback_obj) :
     Closure(plugin, url),
     np_callback_(reinterpret_cast<NPObject*>(callback_obj)) {
   dprintf(("UrlAsNaClDescNotify ctor\n"));
   NPN_RetainObject(np_callback_);
 }
 
 UrlAsNaClDescNotify::~UrlAsNaClDescNotify() {
@@ skipping 269 matching lines @@
         const_cast<NaClDesc*>(
             reinterpret_cast<const NaClDesc*>(NaClDescInvalidMake()));
     module_->StreamAsFile(npp_, invalid, const_cast<char*>(url));
   } else {
     module_->StreamAsFile(npp_, ndshm->desc(), const_cast<char*>(url));
     ndshm->Delete();
   }
 }
 
 }  // namespace nacl_srpc