Merging upstream version 127.0.

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

1 files changed, 6 insertions, 2 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();