C++ bindings: A struct's Deserialize() now does validation before deserializing.

services/authentication/accounts_db_manager.cc

 // Copyright 2016 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 "services/authentication/accounts_db_manager.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_tokenizer.h"
@@ skipping 163 matching lines @@
 
   if (error != mojo::files::Error::OK) {
     LOG(ERROR) << "Read() error on accounts db: " << error;
     error_ = CREDENTIALS_DB_READ_ERROR;
     return;
   }
 
   if (bytes_read.size() != 0) {
     // Deserialize data from file
     const char* data = reinterpret_cast<const char*>(&bytes_read[0]);
-
-    // Validate the file contents before deserializing
-    mojo::internal::BoundsChecker bounds_checker(data, bytes_read.size(), 0);
-    std::string error;
-    mojo::internal::ValidationError verror =
-        internal::CredentialStore_Data::Validate(data, &bounds_checker, &error);
-    if (verror != mojo::internal::ValidationError::NONE) {
-      LOG(ERROR) << "Validation() error on accounts db ["
-                 << ValidationErrorToString(verror) << "][" << error << "]";
+    if (!creds_store_.Deserialize((void*)data, bytes_read.size())) {
+      LOG(ERROR) << "Deserialize() error on accounts db.";
       error_ = CREDENTIALS_DB_VALIDATE_ERROR;
       return;
     }
-
-    creds_store_.Deserialize((void*)data);
     // When we have multiple versions, this is not a fatal error, but a sign
     // that we need to update (or reinitialize) the db.
     CHECK_EQ(creds_store_.version, kCredsDbVersion);
   } else {
     creds_store_.version = kCredsDbVersion;
   }
 
   db_init_option_ |= CREDENTIALS_DB_INIT_SUCCESS;
 }
 
 void AccountsDbManager::OnAuthorizationsFileReadResponse(
     const mojo::files::Error error,
     const mojo::Array<uint8_t> bytes_read) {
   CHECK(error_ == NONE);
 
   if (error != mojo::files::Error::OK) {
     LOG(ERROR) << "Read() error on auth db: " << error;
     error_ = AUTHORIZATIONS_DB_READ_ERROR;
     return;
   }
 
   if (bytes_read.size() != 0) {
     // Deserialize data from file
     const char* data = reinterpret_cast<const char*>(&bytes_read[0]);
-
-    // Validate the file contents before deserializing
-    mojo::internal::BoundsChecker bounds_checker(data, bytes_read.size(), 0);
-    if (internal::Db_Data::Validate(data, &bounds_checker, nullptr) !=
-        mojo::internal::ValidationError::NONE) {
-      LOG(ERROR) << "Validation() error on auth db.";
+    if (!auth_grants_.Deserialize((void*)data, bytes_read.size())) {
+      LOG(ERROR) << "Deserialize() error on auth db.";
       error_ = AUTHORIZATIONS_DB_VALIDATE_ERROR;
       return;
     }
 
-    auth_grants_.Deserialize((void*)data);
     // When we have multiple versions, this is not a fatal error, but a sign
     // that we need to update (or reinitialize) the db.
     CHECK_EQ(auth_grants_.version, kAuthDbVersion);
   } else {
     auth_grants_.version = kAuthDbVersion;
   }
 
   db_init_option_ |= AUTHORIZATIONS_DB_INIT_SUCCESS;
 }
 
@@ skipping 40 matching lines @@
   CHECK(error_ == NONE);
 
   if (mojo::files::Error::OK != error) {
     LOG(ERROR) << "Write() error on auth db:" << error;
     error_ = AUTHORIZATIONS_DB_WRITE_ERROR;
     return;
   }
 }
 
 }  // namespace authentication