diff options
| author | Christopher Ferris <cferris@google.com> | 2021-10-12 16:23:44 +0200 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-12 16:23:44 +0200 |
| commit | 90cf76e645ebcdd47744789448d11cd84d92465b (patch) | |
| tree | d29110f02a00665a9296772627d02f532c5ff41b | |
| parent | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24f04c872a -s ours am: 2a4893e165 -s ours (diff) | |
| parent | Do not write past end of inotify event structure. (diff) | |
| download | android_bootable_recovery-90cf76e645ebcdd47744789448d11cd84d92465b.tar android_bootable_recovery-90cf76e645ebcdd47744789448d11cd84d92465b.tar.gz android_bootable_recovery-90cf76e645ebcdd47744789448d11cd84d92465b.tar.bz2 android_bootable_recovery-90cf76e645ebcdd47744789448d11cd84d92465b.tar.lz android_bootable_recovery-90cf76e645ebcdd47744789448d11cd84d92465b.tar.xz android_bootable_recovery-90cf76e645ebcdd47744789448d11cd84d92465b.tar.zst android_bootable_recovery-90cf76e645ebcdd47744789448d11cd84d92465b.zip | |
| -rw-r--r-- | minui/events.cpp | 8 |
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; } |