This commit is contained in:
Dominik Maier
2020-05-30 20:38:01 +02:00
parent 4a54328901
commit c0ed118ba5
2 changed files with 4 additions and 10 deletions

View File

@ -107,14 +107,7 @@ u8 *u_stringify_mem_size(u8 *buf, u64 val);
u8 *u_stringify_time_diff(u8 *buf, u64 cur_ms, u64 event_ms); u8 *u_stringify_time_diff(u8 *buf, u64 cur_ms, u64 event_ms);
/* Wrapper for select() and read(), reading exactly len bytes. /* Reads the map size from ENV */
Returns the time passed to read.
stop_soon should point to a variable indicating ctrl+c was pressed.
If the wait times out, returns timeout_ms + 1;
Returns 0 if an error occurred (fd closed, signal, ...); */
u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms,
volatile u8 *stop_soon_p);
u32 get_map_size(void); u32 get_map_size(void);
#endif #endif

View File

@ -454,7 +454,8 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
rlen = 0; rlen = 0;
if (fsrv->exec_tmout) { if (fsrv->exec_tmout) {
u32 time_ms = read_s32_timed(fsrv->fsrv_st_fd, &status, u32 time_ms =
read_s32_timed(fsrv->fsrv_st_fd, &status,
fsrv->exec_tmout * FORK_WAIT_MULT, stop_soon_p); fsrv->exec_tmout * FORK_WAIT_MULT, stop_soon_p);
if (!time_ms) { if (!time_ms) {