PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" am: b17cdb26df am: 7e1af2dd40

Browse Source 
Change-Id: I05410938bc94fb40a9a57f297eb52d487fc2daca
This commit is contained in:
Automerger Merge Worker
2020-01-14 19:21:38 +00:00
parent 9f84418306 7e1af2dd40
commit 444bfb7482
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
minui/events.cpp
View File

@@ -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) {