diff options
| author | Stephane Lee <stayfan@google.com> | 2020-01-14 20:07:08 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-14 20:07:08 +0100 |
| commit | 7e1af2dd407da07f907158c86014de33e5d313f2 (patch) | |
| tree | a2e85595d082191043e291abe033aaccc1cf8031 | |
| parent | Merge "Add elsk@ to OWNERS" (diff) | |
| parent | Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" (diff) | |
| download | android_bootable_recovery-7e1af2dd407da07f907158c86014de33e5d313f2.tar android_bootable_recovery-7e1af2dd407da07f907158c86014de33e5d313f2.tar.gz android_bootable_recovery-7e1af2dd407da07f907158c86014de33e5d313f2.tar.bz2 android_bootable_recovery-7e1af2dd407da07f907158c86014de33e5d313f2.tar.lz android_bootable_recovery-7e1af2dd407da07f907158c86014de33e5d313f2.tar.xz android_bootable_recovery-7e1af2dd407da07f907158c86014de33e5d313f2.tar.zst android_bootable_recovery-7e1af2dd407da07f907158c86014de33e5d313f2.zip | |
| -rw-r--r-- | minui/events.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/minui/events.cpp b/minui/events.cpp index f331ed68a..87f811225 100644 --- a/minui/events.cpp +++ b/minui/events.cpp @@ -90,9 +90,11 @@ static int inotify_cb(int fd, __unused uint32_t epevents) { // The inotify will put one or several complete events. // Should not read part of one event. - size_t event_len; - int ret = ioctl(fd, FIONREAD, &event_len); + int event_len_int; + int ret = ioctl(fd, FIONREAD, &event_len_int); if (ret != 0) return -1; + if (event_len_int < 0) return -1; + size_t event_len = event_len_int; std::unique_ptr<DIR, decltype(&closedir)> dir(opendir(INPUT_DEV_DIR), closedir); if (!dir) { |