commit 89dfd845b3c7c818e2d6d5e9dac8fb58e64c8fba
author Janis Danisevskis <jdanis@google.com> Fri Feb 10 12:57:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 10 12:57:43 2017 +0000
tree 05bd3fb948447fd5398fc02f1427cf1f7b9783c7
parent 1dca597b71226242e5ca1c9f278d6901e3401a2e
parent b1167fd254782104d3d57710e6a7d5653aee2132

Fix unsafe AuthorizationSet copy constructor am: 856761d5b0
am: b1167fd254

Change-Id: I1c5ac75308e24e5ef4644932d79be0c06392631f

include/keymaster/authorization_set.h

diff --git a/include/keymaster/authorization_set.h b/include/keymaster/authorization_set.h
index 1a7894d..bebbfff 100644
--- a/include/keymaster/authorization_set.h
+++ b/include/keymaster/authorization_set.h
@@ -78,8 +78,9 @@
     // Copy constructor.
     AuthorizationSet(const AuthorizationSet& set) : Serializable(), indirect_data_(nullptr) {
         elems_ = nullptr;
-        Reinitialize(set.elems_, set.elems_size_);
         error_ = set.error_;
+        if (error_ != OK) return;
+        Reinitialize(set.elems_, set.elems_size_);
     }
 
     // Move constructor.