commit 0b34abc135d4f63e1b074604eff386b918d43af5
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 23 00:21:14 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 23 00:21:14 2021 +0000
tree 41f1893200977ebfcf00b714f541b3e8bd85405d
parent e7774409b8ec8ae7179ab2372e759808650f415e
parent 7e86b8e3189f9719538a97952dff8ea1c6b67f8d

Merge cherrypicks of [16034932] into rvc-platform-release.

Change-Id: I993978f286bcba93f425a92a0bc828bbf20b87b5

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