commit e3b2c57632e4abcd03024ca78d99dfabcb12e523
author Yifan Hong <elsk@google.com> Thu Nov 18 05:17:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 18 05:17:59 2021 +0000
tree bf912aab5cc1c4dc1a5a7d38c8d0fa04e3c5a481
parent c3f177b5ec63c6f7b3bccbd7e1e5ef6c250b9baf
parent 71c4cce674055df30c1e184fb5c31d2b459c9d01

Start servicemanager on init in recovery mode. am: 8798099058 am: 71c4cce674

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

Change-Id: I72bb4f8909d8f5e414f5a797160a39f9619565d3

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