commit dfeacf45dae6e6bb0d5f2bb7213f05ff965d27f0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 15 02:49:06 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 15 02:49:06 2021 +0000
tree 137f93318671451aa76ace31c9f76effbab43edd
parent 6874a13f2d00dce3ed621f13693b7cf508af658d
parent 61707b973c45461997ae21703cdef4cd2204439b

Merge "Update caremap to by py3 compatible" am: 18370833aa am: 61707b973c

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

Change-Id: Ie969708f45bb19848c7dd385d1706a78d1cd8812

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