Skip to content

Commit

Permalink
[libFuzzer] Properly handle exceptions with UnhandledExceptionFilter.
Browse files Browse the repository at this point in the history
Use SetUnhandledExceptionFilter instead of AddVectoredExceptionHandler.

According to the documentation on Structured Exception Handling, this is the
order for the Exception Dispatching:
+ If the process is being debugged, the system notifies the debugger.
+ The Vectored Exception Handler is called.
+ The system attempts to locate a frame-based exception handler by searching the
 stack frames of the thread in which the exception occurred.
+ If no frame-based handler can be found, the UnhandledExceptionFilter filter is
 called.
+ Default handling based on the exception type.

So, similar to what we do for asan, we should use SetUnhandledExceptionFilter
instead of AddVectoredExceptionHandler, so user's code that is being fuzzed can
execute frame-based exception handlers before we catch them . We want to catch
unhandled exceptions, not all the exceptions.

Differential Revision: https://reviews.llvm.org/D29462

llvm-svn: 293920
  • Loading branch information
Marcos Pividori committed Feb 2, 2017
1 parent 37e2459 commit d64360d
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions llvm/lib/Fuzzer/FuzzerUtilWindows.cpp
Expand Up @@ -28,7 +28,7 @@ namespace fuzzer {

static const FuzzingOptions* HandlerOpt = nullptr;

LONG CALLBACK ExceptionHandler(PEXCEPTION_POINTERS ExceptionInfo) {
static LONG CALLBACK ExceptionHandler(PEXCEPTION_POINTERS ExceptionInfo) {
switch (ExceptionInfo->ExceptionRecord->ExceptionCode) {
case EXCEPTION_ACCESS_VIOLATION:
case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
Expand Down Expand Up @@ -126,10 +126,7 @@ void SetSignalHandler(const FuzzingOptions& Options) {

if (Options.HandleSegv || Options.HandleBus || Options.HandleIll ||
Options.HandleFpe)
if (!AddVectoredExceptionHandler(1, ExceptionHandler)) {
Printf("libFuzzer: AddVectoredExceptionHandler failed.\n");
exit(1);
}
SetUnhandledExceptionFilter(ExceptionHandler);

if (Options.HandleAbrt)
if (SIG_ERR == signal(SIGABRT, CrashHandler)) {
Expand Down

0 comments on commit d64360d

Please sign in to comment.