github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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(
NSDictionary* dict) {
if (!dict)
if (!dict || ![NSJSONSerialization isValidJSONObject:dict])
return nullptr;
NSData* data = [NSJSONSerialization dataWithJSONObject:dict