commit 71fc1fb76e0fc19e9ac4000912717184b34dba55
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 02 23:20:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 02 23:20:40 2021 +0000
tree ff70c0459a997b7480d3310263386aa5c7092827
parent f473d0cef2930f8404ac262d93eb9067c2b41c3a
parent 4e6e027086a7970d8a0a8e67c55e79865fdbfc83

Merge "Use metadata_key_dir instead of metadata_encryption" am: 389e5c114d am: 4e6e027086

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1908137

Change-Id: I39ea589e0ac3df2f3fd2ad02b11877f439438a06

minui/events.cpp

diff --git a/minui/events.cpp b/minui/events.cpp
index 87f8112..863ac74 100644
--- a/minui/events.cpp
+++ b/minui/events.cpp
@@ -29,7 +29,9 @@
 
 #include <functional>
 #include <memory>
+#include <string>
 
+#include <android-base/strings.h>
 #include <android-base/unique_fd.h>
 
 #include "minui/minui.h"
@@ -118,12 +120,12 @@
     }
     offset += sizeof(inotify_event) + pevent->len;
 
-    pevent->name[pevent->len] = '\0';
-    if (strncmp(pevent->name, "event", 5)) {
+    std::string event_name(pevent->name, pevent->len);
+    if (!android::base::StartsWith(event_name, "event")) {
       continue;
     }
 
-    android::base::unique_fd dfd(openat(dirfd(dir.get()), pevent->name, O_RDONLY));
+    android::base::unique_fd dfd(openat(dirfd(dir.get()), event_name.c_str(), O_RDONLY));
     if (dfd == -1) {
       break;
     }