Fix NULL deref in safe browsing preference validation delegate.

chrome/browser/safe_browsing/preference_validation_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/preference_validation_delegate.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 35 matching lines @@
     : add_incident_(add_incident) {
 }
 
 PreferenceValidationDelegate::~PreferenceValidationDelegate() {
 }
 
 void PreferenceValidationDelegate::OnAtomicPreferenceValidation(
     const std::string& pref_path,
     const base::Value* value,
     PrefHashStoreTransaction::ValueState value_state,
-    TrackedPreferenceHelper::ResetAction reset_action) {
+    TrackedPreferenceHelper::ResetAction /* reset_action */) {
   TPIncident_ValueState proto_value_state = MapValueState(value_state);
   if (proto_value_state != TPIncident::UNKNOWN) {
     scoped_ptr<ClientIncidentReport_IncidentData> incident_data(
         new ClientIncidentReport_IncidentData());
     TPIncident* incident = incident_data->mutable_tracked_preference();
     incident->set_path(pref_path);
-    if (!value->GetAsString(incident->mutable_atomic_value()) &&
-        !base::JSONWriter::Write(value, incident->mutable_atomic_value())) {
+    if (!value ||
+        (!value->GetAsString(incident->mutable_atomic_value()) &&
+         !base::JSONWriter::Write(value, incident->mutable_atomic_value()))) {
       incident->clear_atomic_value();
     }
     incident->set_value_state(proto_value_state);
     add_incident_.Run(incident_data.Pass());
   }
 }
 
 void PreferenceValidationDelegate::OnSplitPreferenceValidation(
     const std::string& pref_path,
     const base::DictionaryValue* dict_value,

[gab, 2014/06/16 15:45:03]

This parameter is also unused, comment it out.

     const std::vector<std::string>& invalid_keys,
     PrefHashStoreTransaction::ValueState value_state,
-    TrackedPreferenceHelper::ResetAction reset_action) {
+    TrackedPreferenceHelper::ResetAction /* reset_action */) {
   TPIncident_ValueState proto_value_state = MapValueState(value_state);
   if (proto_value_state != TPIncident::UNKNOWN) {
     scoped_ptr<ClientIncidentReport_IncidentData> incident_data(
         new ClientIncidentReport_IncidentData());
     TPIncident* incident = incident_data->mutable_tracked_preference();
     incident->set_path(pref_path);
     for (std::vector<std::string>::const_iterator scan(invalid_keys.begin());
          scan != invalid_keys.end();
          ++scan) {
       incident->add_split_key(*scan);
     }
     incident->set_value_state(proto_value_state);
     add_incident_.Run(incident_data.Pass());
   }
 }
 
 }  // namespace safe_browsing