Fix a case of writing an empty HexSSID to Shill.

chromeos/network/onc/onc_utils.cc

 // Copyright (c) 2012 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 "chromeos/network/onc/onc_utils.h"
 
 #include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 246 matching lines @@
         GetFieldSignature(signature, it.key());
     if (!field_signature)
       continue;
 
     FillInHexSSIDFieldsInOncObject(*field_signature->value_signature,
                                    inner_object);
   }
 }
 
 void FillInHexSSIDField(base::DictionaryValue* wifi_fields) {
-  if (!wifi_fields->HasKey(::onc::wifi::kHexSSID)) {
-    std::string ssid_string;
-    wifi_fields->GetStringWithoutPathExpansion(::onc::wifi::kSSID,
-                                               &ssid_string);
-    wifi_fields->SetStringWithoutPathExpansion(
-        ::onc::wifi::kHexSSID,
-        base::HexEncode(ssid_string.c_str(), ssid_string.size()));
+  std::string ssid_string;
+  if (wifi_fields->HasKey(::onc::wifi::kHexSSID) ||
+      !wifi_fields->GetStringWithoutPathExpansion(::onc::wifi::kSSID,
+                                                  &ssid_string)) {
+    return;
   }
+  if (ssid_string.empty()) {
+    ONC_LOG_ERROR("Found empty SSID field.");
+    return;
+  }
+  wifi_fields->SetStringWithoutPathExpansion(
+      ::onc::wifi::kHexSSID,
+      base::HexEncode(ssid_string.c_str(), ssid_string.size()));
 }
 
 namespace {
 
 class OncMaskValues : public Mapper {
  public:
   static scoped_ptr<base::DictionaryValue> Mask(
       const OncValueSignature& signature,
       const base::DictionaryValue& onc_object,
       const std::string& mask) {
@@ skipping 450 matching lines @@
   }
 
   const base::ListValue* recommended_keys = NULL;
   return (onc->GetList(recommended_property_key, &recommended_keys) &&
           recommended_keys->Find(base::StringValue(property_basename)) !=
           recommended_keys->end());
 }
 
 }  // namespace onc
 }  // namespace chromeos