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

Merge pull request #383 from dgmelski/fix-read-timed

Browse Source 
Fix read_timed when accumulating short reads
This commit is contained in:
Dominik Maier
2020-05-29 18:58:25 +02:00
committed by GitHub
parent 2ce243bc6e 4b01d594c4
commit 408ef5298b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -101,7 +101,7 @@ endif
ifeq "$(shell uname -s)" "OpenBSD" ifeq "$(shell uname -s)" "OpenBSD"
override CFLAGS += -I /usr/local/include/ override CFLAGS += -I /usr/local/include/
LDFLAGS += -L /usr/local/lib/ LDFLAGS += -Wl,-z,notext -L /usr/local/lib/
endif endif
ifeq "$(shell uname -s)" "NetBSD" ifeq "$(shell uname -s)" "NetBSD"

8
src/afl-common.c
View File

@ -885,9 +885,9 @@ u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms,
timeout.tv_usec = (timeout_ms % 1000) * 1000; timeout.tv_usec = (timeout_ms % 1000) * 1000;
size_t read_total = 0; size_t read_total = 0;
size_t len_read = 0; ssize_t len_read = 0;
while (len_read < len) { while (read_total < len) {
/* 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. */
int sret = select(fd + 1, &readfds, NULL, NULL, &timeout); int sret = select(fd + 1, &readfds, NULL, NULL, &timeout);
@ -905,8 +905,8 @@ u32 read_timed(s32 fd, void *buf, size_t len, u32 timeout_ms,
} }
len_read = read(fd, ((u8 *)buf) + len_read, len - len_read); len_read = read(fd, ((u8 *)buf) + read_total, len - read_total);
if (!len_read) { return 0; } if (len_read <= 0) { return 0; }
read_total += len_read; read_total += len_read;
} }

2
test/test.sh
View File

@ -115,7 +115,7 @@ $ECHO "${RESET}${GREY}[*] starting afl++ test framework ..."
test -z "$SYS" && $ECHO "$YELLOW[-] uname -m did not succeed" test -z "$SYS" && $ECHO "$YELLOW[-] uname -m did not succeed"
$ECHO "$BLUE[*] Testing: ${AFL_GCC}, afl-showmap, afl-fuzz, afl-cmin and afl-tmin" $ECHO "$BLUE[*] Testing: ${AFL_GCC}, afl-showmap, afl-fuzz, afl-cmin and afl-tmin"
test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc" && { test "$SYS" = "i686" -o "$SYS" = "x86_64" -o "$SYS" = "amd64" -o "$SYS" = "i86pc" -o "$SYS" = "i386" && {
test -e ../${AFL_GCC} -a -e ../afl-showmap -a -e ../afl-fuzz && { test -e ../${AFL_GCC} -a -e ../afl-showmap -a -e ../afl-fuzz && {
../${AFL_GCC} -o test-instr.plain ../test-instr.c > /dev/null 2>&1 ../${AFL_GCC} -o test-instr.plain ../test-instr.c > /dev/null 2>&1
AFL_HARDEN=1 ../${AFL_GCC} -o test-compcov.harden test-compcov.c > /dev/null 2>&1 AFL_HARDEN=1 ../${AFL_GCC} -o test-compcov.harden test-compcov.c > /dev/null 2>&1