| Index: chrome/browser/supervised_user/supervised_user_settings_service.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc
|
| index 6628c217b971eae0cc53a31dfcc1dc00efbd5a72..05eb3bf579faee184790d030157f74c4ffc222cb 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_settings_service.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc
|
| @@ -241,6 +241,14 @@ SyncMergeResult SupervisedUserSettingsService::MergeDataAndStartSyncing(
|
| sync_data.GetSpecifics().managed_user_setting();
|
| std::unique_ptr<base::Value> value =
|
| JSONReader::Read(supervised_user_setting.value());
|
| + // Wrongly formatted input will cause null values.
|
| + // SetWithoutPathExpansion below requires non-null values.
|
| + if (!value) {
|
| + DLOG(ERROR) << "Invalid managed user setting value: "
|
| + << supervised_user_setting.value()
|
| + << ". Values must be JSON values.";
|
| + continue;
|
| + }
|
| std::string name_suffix = supervised_user_setting.name();
|
| std::string name_key = name_suffix;
|
| base::DictionaryValue* dict = GetDictionaryAndSplitKey(&name_suffix);
|
|
|