summaryrefslogtreecommitdiffstats
path: root/js/xpconnect/shell
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:35:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-12 05:35:37 +0000
commita90a5cba08fdf6c0ceb95101c275108a152a3aed (patch)
tree532507288f3defd7f4dcf1af49698bcb76034855 /js/xpconnect/shell
parentAdding debian version 126.0.1-1. (diff)
downloadfirefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz
firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'js/xpconnect/shell')
-rw-r--r--js/xpconnect/shell/moz.build7
-rw-r--r--js/xpconnect/shell/xpcshell.cpp3
2 files changed, 8 insertions, 2 deletions
diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build
index de3b050b79..0fe251bbd9 100644
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -10,8 +10,11 @@ SOURCES += [
"xpcshell.cpp",
]
-if CONFIG["LIBFUZZER"]:
- USE_LIBS += ["fuzzer"]
+if CONFIG["FUZZING_INTERFACES"]:
+ if CONFIG["LIBFUZZER"]:
+ USE_LIBS += ["fuzzer"]
+ else:
+ USE_LIBS += ["fuzzer-interface"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
SOURCES += [
diff --git a/js/xpconnect/shell/xpcshell.cpp b/js/xpconnect/shell/xpcshell.cpp
index 5e44db3b34..02de402743 100644
--- a/js/xpconnect/shell/xpcshell.cpp
+++ b/js/xpconnect/shell/xpcshell.cpp
@@ -77,6 +77,9 @@ int main(int argc, char** argv, char** envp) {
#ifdef LIBFUZZER
shellData.fuzzerDriver = fuzzer::FuzzerDriver;
#endif
+#ifdef AFLFUZZ
+ shellData.fuzzerDriver = afl_interface_raw;
+#endif
int result = bootstrap->XRE_XPCShellMain(argc, argv, envp, &shellData);