mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Change base::JSONReader::ReadToValue() to return Optional.

Browse source 
https://chromium-review.googlesource.com/c/chromium/src/+/1476186
This commit is contained in:
deepak1556 2019-02-27 17:35:27 +05:30 • committed by Samuel Attard
commit 0243b0ffc1
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/common/asar/archive.cc
View file

@ -186,16 +186,15 @@ bool Archive::Init() {
return false; return false;
} }
std::string error; base::Optional<base::Value> value = base::JSONReader::Read(header);
base::JSONReader reader;
std::unique_ptr<base::Value> value(reader.ReadToValue(header));
if (!value || !value->is_dict()) { if (!value || !value->is_dict()) {
LOG(ERROR) << "Failed to parse header: " << error; LOG(ERROR) << "Failed to parse header";
return false; return false;
} }
header_size_ = 8 + size; header_size_ = 8 + size;
header_.reset(static_cast<base::DictionaryValue*>(value.release())); header_ = base::DictionaryValue::From(
std::make_unique<base::Value>(value->Clone()));
return true; return true;
} }