From 2544593c13295ddb38b20c8365b1e5558f0749e0 Mon Sep 17 00:00:00 2001 From: Alex Hultman Date: Wed, 19 Aug 2020 15:55:02 +0200 Subject: [PATCH] Update libEpollFuzzer --- fuzzing/EpollHelloWorld.cpp | 4 ++-- fuzzing/Makefile | 2 +- fuzzing/libEpollFuzzer | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fuzzing/EpollHelloWorld.cpp b/fuzzing/EpollHelloWorld.cpp index c26a9b2..d653f1b 100644 --- a/fuzzing/EpollHelloWorld.cpp +++ b/fuzzing/EpollHelloWorld.cpp @@ -29,8 +29,8 @@ void test() { /* Handlers */ .open = [](auto *ws) { /* Open event here, you may access ws->getUserData() which points to a PerSocketData struct */ - ws->getUserData(); - ws->getRemoteAddressAsText(); + ws->getNativeHandle(); + ws->getRemoteAddressAsText(); }, .message = [](auto *ws, std::string_view message, uWS::OpCode opCode) { ws->send(message, opCode, true); diff --git a/fuzzing/Makefile b/fuzzing/Makefile index bc81544..fe50ca3 100644 --- a/fuzzing/Makefile +++ b/fuzzing/Makefile @@ -6,7 +6,7 @@ CFLAGS ?= -DLIBUS_NO_SSL OUT ?= . # These are fetched from libEpollFuzzer -WRAPPED_SYSCALLS = -Wl,--wrap=sendto,--wrap=send,--wrap=recv,--wrap=read,--wrap=listen,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=setsockopt,--wrap=fcntl,--wrap=bind,--wrap=socket,--wrap=epoll_wait,--wrap=epoll_create1,--wrap=timerfd_settime,--wrap=close,--wrap=accept4,--wrap=eventfd,--wrap=timerfd_create,--wrap=epoll_ctl,--wrap=shutdown +WRAPPED_SYSCALLS = -Wl,--wrap=getpeername,--wrap=sendto,--wrap=send,--wrap=recv,--wrap=read,--wrap=listen,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=setsockopt,--wrap=fcntl,--wrap=bind,--wrap=socket,--wrap=epoll_wait,--wrap=epoll_create1,--wrap=timerfd_settime,--wrap=close,--wrap=accept4,--wrap=eventfd,--wrap=timerfd_create,--wrap=epoll_ctl,--wrap=shutdown oss-fuzz: # Build zlib (it listens to CFLAGS, CC and CXX) diff --git a/fuzzing/libEpollFuzzer b/fuzzing/libEpollFuzzer index 43364f1..02dd669 160000 --- a/fuzzing/libEpollFuzzer +++ b/fuzzing/libEpollFuzzer @@ -1 +1 @@ -Subproject commit 43364f1f3b102f47d8c15e51a7394909f86efd00 +Subproject commit 02dd669dfd70d0de507e7732468c3127c054aea1