Emit an error log line when attempting to connect to an app at an invalid URL.

mojo/shell/desktop/mojo_main.cc

 // Copyright 2013 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 <algorithm>
 #include <iostream>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 39 matching lines @@
 GURL GetAppURLAndSetArgs(const base::CommandLine::StringType& app_url_and_args,
                          mojo::shell::Context* context) {
   // SplitString() returns empty strings for extra delimeter characters (' ').
   std::vector<std::string> argv;
   SplitString(app_url_and_args, &argv);
   argv.erase(std::remove_if(argv.begin(), argv.end(), is_empty), argv.end());
 
   if (argv.empty())
     return GURL::EmptyGURL();
   GURL app_url(argv[0]);
+  if (!app_url.is_valid()) {
+    LOG(ERROR) << "Error: invalid URL: " << argv[0];

[Aaron Boodman, 2014/11/20 22:16:02]

Add a return here. We don't want to set any args for an invalid URL.

[azani, 2014/11/20 22:18:00]

Done.

+  }
   if (argv.size() > 1)
     context->application_manager()->SetArgsForURL(argv, app_url);
   return app_url;
 }
 
 void RunApps(mojo::shell::Context* context) {
   const auto& command_line = *base::CommandLine::ForCurrentProcess();
-  for (const auto& arg : command_line.GetArgs())
-    context->Run(GetAppURLAndSetArgs(arg, context));
+  for (const auto& arg : command_line.GetArgs()) {
+    GURL url = GetAppURLAndSetArgs(arg, context);
+    if (!url.is_valid())
+      return;
+    context->Run(url);
+  }
 }
 
 void Usage() {
   std::cerr << "Launch Mojo applications.\n";
   std::cerr
       << "Usage: mojo_shell"
       << " [--" << switches::kArgsFor << "=<mojo-app>]"
       << " [--" << switches::kContentHandlers << "=<handlers>]"
       << " [--" << switches::kEnableExternalApplications << "]"
       << " [--" << switches::kDisableCache << "]"
@@ skipping 82 matching lines @@
         if (kv.first == switches::kArgsFor)
           GetAppURLAndSetArgs(kv.second, &shell_context);
       }
 
       message_loop.PostTask(FROM_HERE, base::Bind(RunApps, &shell_context));
       message_loop.Run();
     }
   }
   return 0;
 }