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

add loop to catch null values

Browse source
This commit is contained in:
Shelley Vohr 2017-12-13 14:02:43 -05:00
parent 6252ce466c
commit 3fc844c15a
No known key found for this signature in database
GPG key ID: F13993A75599653C
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/api/atom_api_system_preferences_mac.mm
View file

@ -152,13 +152,13 @@ void SystemPreferences::RegisterDefaults(mate::Arguments* args) {
} else { } else {
@try { @try {
NSDictionary* dict = DictionaryValueToNSDictionary(value); NSDictionary* dict = DictionaryValueToNSDictionary(value);
// for (id key in dict) { for (id key in dict) {
// id value = [dict objectForKey:key]; id value = [dict objectForKey:key];
// if (value == nil) { if ([value isKindOfClass:[NSNull class]] || value == nil) {
// printf("HELLO\n"); args->ThrowError("Invalid userDefault data provided");
// args->ThrowError("Invalid userDefault data provided"); return;
// } }
// } }
[[NSUserDefaults standardUserDefaults] registerDefaults:dict]; [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
} @catch (NSException* exception) { } @catch (NSException* exception) {
args->ThrowError("Invalid userDefault data provided"); args->ThrowError("Invalid userDefault data provided");

1
spec/api-system-preferences-spec.js
View file

@ -66,6 +66,7 @@ describe('systemPreferences module', () => {
1, 1,
null, null,
new Date(), new Date(),
{ 'one': null }
] ]
for (const badDefault of badDefaults) { for (const badDefault of badDefaults) {