summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2021-10-08 21:05:31 +0200
committerKelvin Zhang <zhangkelvin@google.com>2021-10-12 02:29:45 +0200
commit07d67c1e4f0f6faa9c4c6060ce9c3d79a1ac9082 (patch)
treed29110f02a00665a9296772627d02f532c5ff41b
parent[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76eeeea938 -s ours (diff)
downloadandroid_bootable_recovery-07d67c1e4f0f6faa9c4c6060ce9c3d79a1ac9082.tar
android_bootable_recovery-07d67c1e4f0f6faa9c4c6060ce9c3d79a1ac9082.tar.gz
android_bootable_recovery-07d67c1e4f0f6faa9c4c6060ce9c3d79a1ac9082.tar.bz2
android_bootable_recovery-07d67c1e4f0f6faa9c4c6060ce9c3d79a1ac9082.tar.lz
android_bootable_recovery-07d67c1e4f0f6faa9c4c6060ce9c3d79a1ac9082.tar.xz
android_bootable_recovery-07d67c1e4f0f6faa9c4c6060ce9c3d79a1ac9082.tar.zst
android_bootable_recovery-07d67c1e4f0f6faa9c4c6060ce9c3d79a1ac9082.zip
-rw-r--r--minui/events.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/minui/events.cpp b/minui/events.cpp
index 87f811225..863ac7474 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 @@ static int inotify_cb(int fd, __unused uint32_t epevents) {
}
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;
}