services/catalog/reader.cc - Issue 2117693002: Fix crash issues if there is no resources pack in content shell

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: services/catalog/reader.cc

Issue 2117693002: Fix crash issues if there is no resources pack in content shell Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months 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

Index: services/catalog/reader.cc

diff --git a/services/catalog/reader.cc b/services/catalog/reader.cc

index ad8dd74887387b0bbb87b7287489088a42323048..31449429c4fac2bebe2c36772aa472b65787d11b 100644

--- a/services/catalog/reader.cc

+++ b/services/catalog/reader.cc

@@ -181,6 +181,8 @@ void Reader::CreateEntryForName(

if (manifest_provider_ &&

manifest_provider_->GetApplicationManifest(mojo_name,

&manifest_contents)) {

+ if (manifest_contents.empty())

+ return;

std::unique_ptr<base::Value> manifest_root =

base::JSONReader::Read(manifest_contents);

base::PostTaskAndReplyWithResult(

« no previous file with comments | « no previous file | ui/base/resource/data_pack.cc » ('j') | no next file with comments »