commit 41ec1b368a74bc285da2fc2acc8de88ae7ac7776
author Daeho Jeong <daehojeong@google.com> Sat Dec 04 05:37:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 04 05:37:49 2021 +0000
tree 17360b0678e4a4a8667a653626e920cab1d35951
parent 71fc1fb76e0fc19e9ac4000912717184b34dba55
parent 0e04a02326a4e2ae6e6ffa427e6589fcd3c07827

Merge "Add erofs tools in recovery mode" am: 90064ac238 am: 0e04a02326

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

Change-Id: I46a97a45efd0ecb02f649ecc0fffd4b62db2dcd6

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;
     }