commit 477e6096e5af10d7c94971fd68c367ed91cdfe41
author Elliott Hughes <enh@google.com> Fri Jan 13 19:53:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 13 19:53:59 2017 +0000
tree 33465d4994f699d06e48e2cdf32c4687a7dab43d
parent 60e97e7adb968f9f31a7ad69aa338ad3a197b920
parent 4c53ef13f6ebe4fc1df8c7cbdef616b9a4eead83

Merge "Move to .md files for even trivial documentation." am: 5d05d0e74e am: 84f52c10a5
am: f4b14761fd

Change-Id: I438f4437286f1b7aded0d506dddff38ac772c12a

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index d4a92e5..96bda07 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -166,7 +166,14 @@
                     enrolled_password_handle, enrolled_password_handle_length);
         }
 
-        if (ret == 0) {
+        if (ret == GATEKEEPER_RESPONSE_OK && (*enrolled_password_handle == nullptr ||
+            *enrolled_password_handle_length != sizeof(password_handle_t))) {
+            ret = GATEKEEPER_RESPONSE_ERROR;
+            ALOGE("HAL: password_handle=%p size_of_handle=%" PRIu32 "\n",
+                  *enrolled_password_handle, *enrolled_password_handle_length);
+        }
+
+        if (ret == GATEKEEPER_RESPONSE_OK) {
             gatekeeper::password_handle_t *handle =
                     reinterpret_cast<gatekeeper::password_handle_t *>(*enrolled_password_handle);
             store_sid(uid, handle->user_id);