commit 91ce222f5f9741f84d0e7e0a31aaf3b693464b65
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 22 07:30:54 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 22 07:30:54 2021 +0000
tree d2f58833a54996c5c04c59a1e93e12ced7713b9a
parent dfeacf45dae6e6bb0d5f2bb7213f05ff965d27f0
parent a582cd483a7fa944766681e8debe56d7593f42ab

Merge "libminui for vendor" am: 67fb9e94d2 am: a582cd483a

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

Change-Id: Idb6333246f83f7a5e320a5fcabfb60f7d5c8bfe9

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