diff --git a/keymaster/4.0/support/keymaster_utils.cpp b/keymaster/4.0/support/keymaster_utils.cpp index 729e1c1dbf..e35fdd36d5 100644 --- a/keymaster/4.0/support/keymaster_utils.cpp +++ b/keymaster/4.0/support/keymaster_utils.cpp @@ -21,7 +21,9 @@ namespace android { namespace hardware { inline static bool operator<(const hidl_vec& a, const hidl_vec& b) { - return memcmp(a.data(), b.data(), std::min(a.size(), b.size())) == -1; + auto result = memcmp(a.data(), b.data(), std::min(a.size(), b.size())); + if (!result) return a.size() < b.size(); + return result < 0; } template