Fill empty fields from keyring result with default values.

chrome/browser/password_manager/native_backend_libsecret.cc

 // Copyright (c) 2015 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/password_manager/native_backend_libsecret.h"
 
 #include <dlfcn.h>
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 
 using autofill::PasswordForm;
 using base::UTF8ToUTF16;
 using base::UTF16ToUTF8;
 
+namespace {
+char empty_string[] = "";

[vabr (Chromium), 2015/01/29 14:23:13]

const char kEmptyString[] = "";

[dvadym, 2015/01/29 14:27:57]

Done.

+}
+
 typeof(&::secret_password_store_sync)
     LibsecretLoader::secret_password_store_sync;
 typeof(&::secret_service_search_sync)
     LibsecretLoader::secret_service_search_sync;
 typeof(&::secret_password_clear_sync)
     LibsecretLoader::secret_password_clear_sync;
 typeof(&::secret_item_get_secret) LibsecretLoader::secret_item_get_secret;
 typeof(&::secret_value_get_text) LibsecretLoader::secret_value_get_text;
 typeof(&::secret_item_get_attributes)
     LibsecretLoader::secret_item_get_attributes;
@@ skipping 81 matching lines @@
      {"date_synced", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"display_name", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"avatar_url", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"federation_url", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {"is_zero_click", SECRET_SCHEMA_ATTRIBUTE_INTEGER},
      // This field is always "chrome-profile_id" so that we can search for it.
      {"application", SECRET_SCHEMA_ATTRIBUTE_STRING},
      {nullptr, SECRET_SCHEMA_ATTRIBUTE_STRING}}};
 
 char* GetStringFromAttributes(GHashTable* attrs, const char* keyname) {
-  return static_cast<char*>(g_hash_table_lookup(attrs, keyname));
+  gpointer value = g_hash_table_lookup(attrs, keyname);
+  return value ? static_cast<char*>(value) : empty_string;
 }
 
 uint32_t GetUintFromAttributes(GHashTable* attrs, const char* keyname) {
-  char* value = static_cast<char*>(g_hash_table_lookup(attrs, keyname));
+  gpointer value = g_hash_table_lookup(attrs, keyname);
+  if (!value)
+    return uint32_t();
   uint32_t result;
-  bool value_ok = base::StringToUint(value, &result);
+  bool value_ok = base::StringToUint(static_cast<char*>(value), &result);
   DCHECK(value_ok);
   return result;
 }
 
 // Convert the attributes into a new PasswordForm.
 // Note: does *not* get the actual password, as that is not a key attribute!
 // Returns nullptr if the attributes are for the wrong application.
 scoped_ptr<PasswordForm> FormOutOfAttributes(GHashTable* attrs) {
   base::StringPiece app_value = GetStringFromAttributes(attrs, "application");
   if (!app_value.starts_with(kLibsecretAppString))
@@ skipping 442 matching lines @@
   return true;
 }
 
 std::string NativeBackendLibsecret::GetProfileSpecificAppString(
     LocalProfileId id) {
   // Originally, the application string was always just "chrome" and used only
   // so that we had *something* to search for since GNOME Keyring won't search
   // for nothing. Now we use it to distinguish passwords for different profiles.
   return base::StringPrintf("%s-%d", kLibsecretAppString, id);
 }