Linux: improved pickle error checking in KWallet support code.

I'll try to merge this and r82747 to the 742 branch.
BUG=80728
Review URL: http://codereview.chromium.org/6893074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83243 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 3 deletions

diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc
index 7305747..5d27c62 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x.cc
+++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc
@@ -497,14 +497,19 @@ void NativeBackendKWallet::DeserializeValue(const string& signon_realm,
   void* iter = NULL;
 
   int version = -1;
-  pickle.ReadInt(&iter, &version);
-  if (version != kPickleVersion) {
+  if (!pickle.ReadInt(&iter, &version) || version != kPickleVersion) {
     // This is the only version so far, so anything else is an error.
+    LOG(ERROR) << "Failed to deserialize KWallet entry "
+               << "(realm: " << signon_realm << ")";
     return;
   }
 
   size_t count = 0;
-  pickle.ReadSize(&iter, &count);
+  if (!pickle.ReadSize(&iter, &count)) {
+    LOG(ERROR) << "Failed to deserialize KWallet entry "
+               << "(realm: " << signon_realm << ")";
+    return;
+  }
 
   forms->reserve(forms->size() + count);
   for (size_t i = 0; i < count; ++i) {