Merge "Appease UB sanitizer on reading gatekeeper error codes." am: f1473a3ae3

Original change: https://android-review.googlesource.com/c/platform/system/gatekeeper/+/1553309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8dbb9019cea7de76bfc5d674c1e2db9ea574762

1 files changed, 17 insertions, 1 deletions

diff --git a/gatekeeper_messages.cpp b/gatekeeper_messages.cpp
index 01f2f8c..3b78664 100644
--- a/gatekeeper_messages.cpp
+++ b/gatekeeper_messages.cpp
@@ -50,6 +50,22 @@ static inline void append_to_buffer(uint8_t **buffer, const SizedBuffer &to_appe
     }
 }
 
+static inline gatekeeper_error_t readError(uint32_t code) {
+    switch (code) {
+        case ERROR_NONE:
+            return ERROR_NONE;
+        case ERROR_INVALID:
+            return ERROR_INVALID;
+        case ERROR_RETRY:
+            return ERROR_RETRY;
+        case ERROR_MEMORY_ALLOCATION_FAILED:
+            return ERROR_MEMORY_ALLOCATION_FAILED;
+        case ERROR_UNKNOWN:
+        default:
+            return ERROR_UNKNOWN;
+    }
+}
+
 static inline gatekeeper_error_t read_from_buffer(const uint8_t **buffer, const uint8_t *end,
         SizedBuffer *target) {
     if (target == nullptr) return ERROR_INVALID;
@@ -119,7 +135,7 @@ uint32_t GateKeeperMessage::Serialize(uint8_t *buffer, const uint8_t *end) const
 gatekeeper_error_t GateKeeperMessage::Deserialize(const uint8_t *payload, const uint8_t *end) {
     if (!fitsBuffer(payload, end, sizeof(serial_header_t))) return ERROR_INVALID;
     const serial_header_t *header = reinterpret_cast<const serial_header_t *>(payload);
-    error = static_cast<gatekeeper_error_t>(header->error);
+    error = readError(header->error);
     user_id = header->user_id;
     payload += sizeof(*header);
     if (error == ERROR_NONE) {