ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-17 20:28:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix timeout bug in read_s32_timed on non linux OSes

Browse Source
This commit is contained in:
Andrea Fioraldi
2020-10-20 20:48:33 +02:00
parent fa191017b5
commit 982260c134
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/afl-forkserver.c
View File

@ -140,7 +140,7 @@ read_s32_timed(s32 fd, s32 *buf, u32 timeout_ms, volatile u8 *stop_soon_p) {
timeout.tv_sec = (timeout_ms / 1000); timeout.tv_sec = (timeout_ms / 1000);
timeout.tv_usec = (timeout_ms % 1000) * 1000; timeout.tv_usec = (timeout_ms % 1000) * 1000;
#if !defined(__linux__) #if !defined(__linux__)
u64 read_start = get_cur_time_us(); u32 read_start = get_cur_time_us();
#endif #endif
/* set exceptfds as well to return when a child exited/closed the pipe. */ /* set exceptfds as well to return when a child exited/closed the pipe. */
@ -166,7 +166,7 @@ restart_select:
timeout_ms, timeout_ms,
((u64)timeout_ms - (timeout.tv_sec * 1000 + timeout.tv_usec / 1000))); ((u64)timeout_ms - (timeout.tv_sec * 1000 + timeout.tv_usec / 1000)));
#else #else
u32 exec_ms = MIN(timeout_ms, get_cur_time_us() - read_start); u32 exec_ms = MIN(timeout_ms, (get_cur_time_us() - read_start) / 1000);
#endif #endif
// ensure to report 1 ms has passed (0 is an error) // ensure to report 1 ms has passed (0 is an error)