chromeos/tools/onc_validator/onc_validator.cc - Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr

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: chromeos/tools/onc_validator/onc_validator.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Win typo fix Created 5 years, 2 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

« chrome/browser/component_updater/recovery_component_installer.cc ('K') | « chromeos/system/statistics_provider.cc ('k') | components/bookmarks/browser/bookmark_codec.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/tools/onc_validator/onc_validator.cc

diff --git a/chromeos/tools/onc_validator/onc_validator.cc b/chromeos/tools/onc_validator/onc_validator.cc

index 14ed8919b87b91f13f87985fb4981a0b4ba1ff33..df74c0560bb42c73f21a581f5172399be48b2ea9 100644

--- a/chromeos/tools/onc_validator/onc_validator.cc

+++ b/chromeos/tools/onc_validator/onc_validator.cc

@@ -90,8 +90,10 @@ scoped_ptr<base::DictionaryValue> ReadDictionary(const std::string& filename) {

base::DictionaryValue* dict = NULL;

std::string json_error;

- base::Value* value = deserializer.Deserialize(NULL, &json_error);

- if (!value) {

+ base::Value* value = deserializer.Deserialize(NULL, &json_error).release();

+ TODO(Olli Raula)

Lei Zhang 2015/10/15 17:36:11 I think you forgot some slashes here. And again, "

+ possible memoryleak http : // crbug.com/543015

+ if (!value) {

LOG(ERROR) << "Couldn't json-deserialize file '" << filename

<< "': " << json_error;

return make_scoped_ptr(dict);