commit d28eded6b9a40e603087e3abffcd6a12c60713a5
author Kelvin Zhang <zhangkelvin@google.com> Sat Oct 09 03:10:49 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 09 03:10:49 2021 +0000
tree a36b487ec355b1c1383bd0c06b3a042032c3c7e2
parent e068339dab1f152bdd06e9d6e83c76eaa7e3d9a2
parent ce87c786116557e89f9da95f550d6816aeaca67e

Merge "Do not write past end of inotify event structure."

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