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

Ignore invalid JSON object when converting NSDictionary

Browse source
This commit is contained in:
Cheng Zhao 2016-05-18 14:50:12 +09:00
parent 97250b53e8
commit 240c346d02
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/mac/dict_util.mm
View file

@ -26,7 +26,7 @@ NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value)
scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue( scoped_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
NSDictionary* dict) { NSDictionary* dict) {
if (!dict) if (!dict || ![NSJSONSerialization isValidJSONObject:dict])
return nullptr; return nullptr;
NSData* data = [NSJSONSerialization dataWithJSONObject:dict NSData* data = [NSJSONSerialization dataWithJSONObject:dict