From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'js/src/shell/jsrtfuzzing') diff --git a/js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp b/js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp index 0b6f505fb6..ac6d706547 100644 --- a/js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp +++ b/js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp @@ -11,8 +11,13 @@ #include // fflush, fprintf, fputs -#include "FuzzerDefs.h" -#include "FuzzingInterface.h" +#ifdef LIBFUZZER +# include "FuzzerDefs.h" +#endif +#ifdef AFLFUZZ +# include "FuzzingInterface.h" +#endif + #include "jsapi.h" // JS_ClearPendingException, JS_IsExceptionPending #include "js/CompilationAndEvaluation.h" // JS::Evaluate @@ -69,7 +74,7 @@ int js::shell::FuzzJSRuntimeStart(JSContext* cx, int* argc, char*** argv) { #ifdef LIBFUZZER fuzzer::FuzzerDriver(&shell::sArgc, &shell::sArgv, FuzzJSRuntimeFuzz); #elif AFLFUZZ - MOZ_CRASH("AFL is unsupported for JS runtime fuzzing integration"); + afl_interface_raw(FuzzJSRuntimeFuzz); #endif return 0; } -- cgit v1.2.3