mojo/shell/desktop/mojo_main.cc - Issue 735863002: Emit an error log line when attempting to connect to an app at an invalid URL.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/shell/desktop/mojo_main.cc

Issue 735863002: Emit an error log line when attempting to connect to an app at an invalid URL. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Check that specified URLs for applications are good. Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« mojo/application_manager/application_manager.cc ('K') | « mojo/application_manager/application_manager.cc ('k') | mojo/shell/dynamic_application_loader.cc » ('j') | mojo/shell/dynamic_application_loader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/shell/desktop/mojo_main.cc

diff --git a/mojo/shell/desktop/mojo_main.cc b/mojo/shell/desktop/mojo_main.cc

index 02be823e8ef4475412f11d99d1cf8c7a6c6e1591..672b97b8d8ae96cc074c607dec61e1551e481882 100644

--- a/mojo/shell/desktop/mojo_main.cc

+++ b/mojo/shell/desktop/mojo_main.cc

@@ -57,6 +57,10 @@ GURL GetAppURLAndSetArgs(const base::CommandLine::StringType& app_url_and_args,

if (argv.empty())

return GURL::EmptyGURL();

GURL app_url(argv[0]);

+ if (!app_url.is_valid() && app_url.possibly_invalid_spec().size() == 0) {

+ LOG(ERROR) << "Error: invalid URL: " << argv[0];

Aaron Boodman 2014/11/20 21:53:59 same feedback as in other file.

azani 2014/11/20 22:10:03 Done.

+ }

+ DCHECK(app_url.possibly_invalid_spec().size() > 0);

if (argv.size() > 1)

context->application_manager()->SetArgsForURL(argv, app_url);

return app_url;