Adding upstream version 127.0.upstream/127.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 8 insertions, 4 deletions

diff --git a/js/xpconnect/src/xpcrtfuzzing/xpcrtfuzzing.cpp b/js/xpconnect/src/xpcrtfuzzing/xpcrtfuzzing.cpp
index 95982733cd..3d7b70cf84 100644
--- a/js/xpconnect/src/xpcrtfuzzing/xpcrtfuzzing.cpp
+++ b/js/xpconnect/src/xpcrtfuzzing/xpcrtfuzzing.cpp
@@ -39,7 +39,7 @@ static void CrashOnPendingException() {
 }
 
 int FuzzXPCRuntimeStart(AutoJSAPI* jsapi, int* argc, char*** argv,
-                        LibFuzzerDriver fuzzerDriver) {
+                        const XREShellData* aShellData) {
   gFuzzModuleName = getenv("FUZZER");
   gJsapi = jsapi;
 
@@ -49,7 +49,11 @@ int FuzzXPCRuntimeStart(AutoJSAPI* jsapi, int* argc, char*** argv,
     return ret;
   }
 
-  ret = fuzzerDriver(argc, argv, FuzzXPCRuntimeFuzz);
+#ifdef AFLFUZZ
+  ret = aShellData->fuzzerDriver(FuzzXPCRuntimeFuzz);
+#else
+  ret = aShellData->fuzzerDriver(argc, argv, FuzzXPCRuntimeFuzz);
+#endif
   if (!ret) {
     fprintf(stdout, "Trying to shutdown!\n");
     int shutdown = FuzzXPCRuntimeShutdown();
diff --git a/js/xpconnect/src/xpcrtfuzzing/xpcrtfuzzing.h b/js/xpconnect/src/xpcrtfuzzing/xpcrtfuzzing.h
index 89cdf5996b..f5779cc435 100644
--- a/js/xpconnect/src/xpcrtfuzzing/xpcrtfuzzing.h
+++ b/js/xpconnect/src/xpcrtfuzzing/xpcrtfuzzing.h
@@ -10,11 +10,11 @@
 #define shell_xpcrtfuzzing_h
 
 #include "mozilla/dom/ScriptSettings.h"  // mozilla::dom::AutoJSAPI
-#include "FuzzerRegistry.h"              // LibFuzzerDriver
+#include "XREShellData.h"
 
 // This is the entry point of the XPC runtime fuzzing code from the XPC shell
 int FuzzXPCRuntimeStart(mozilla::dom::AutoJSAPI* jsapi, int* argc, char*** argv,
-                        LibFuzzerDriver);
+                        const XREShellData*);
 
 // These are the traditional libFuzzer-style functions for initialization
 // and fuzzing iteration.