Merge pull request #1126 from ailin-nemui/null-logger

silence glib log output during fuzzing on oss-fuzz

meson.build

@@ -456,14 +456,15 @@ if get_option('buildtype').contains('debug')
 endif
 
 if want_fuzzer
-  if not cc.has_argument('-fsanitize=fuzzer-no-link')
-    error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
+  if fuzzer_lib.startswith('-fsanitize=fuzzer')
+    if not cc.has_argument('-fsanitize=fuzzer-no-link')
+      error('compiler does not support -fsanitize=fuzzer-no-link, try clang?')
+    endif
+    add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
   endif
-  add_project_arguments('-fsanitize=fuzzer-no-link', language : 'c')
-  if (fuzzer_link_language != 'c')
+  if fuzzer_link_language != 'c'
     add_languages(fuzzer_link_language)
   endif
-  add_project_link_arguments('-fsanitize=fuzzer-no-link', language : fuzzer_link_language)
 endif
 
 ##############

src/fe-fuzz/Makefile.am

@@ -17,6 +17,7 @@ irssi_fuzz_LDADD = \
 
 irssi_fuzz_SOURCES = \
         irssi.c \
+        null-logger.c \
 	../fe-text/module-formats.c
 
 server_fuzz_DEPENDENCIES = @COMMON_LIBS@
@@ -28,7 +29,9 @@ server_fuzz_LDADD = \
 
 server_fuzz_SOURCES = \
 	server.c \
+        null-logger.c \
 	../fe-text/module-formats.c
 
 noinst_HEADERS = \
+        null-logger.h \
 	../fe-text/module-formats.h

src/fe-fuzz/fe-common/core/Makefile.am

@@ -22,6 +22,7 @@ LDADD = \
 	$(FUZZER_LIBS)
 
 theme_load_fuzz_SOURCES = \
+        ../../null-logger.c \
         theme-load.c \
 	$(top_srcdir)/src/fe-text/module-formats.c
 

src/fe-fuzz/fe-common/core/meson.build

@@ -1,6 +1,7 @@
 # this file is part of irssi
 executable('theme-load-fuzz',
   files(
+    '../../null-logger.c',
     'theme-load.c',
     '../../../fe-text/module-formats.c',
   ),

src/fe-fuzz/fe-common/core/theme-load.c

@@ -29,6 +29,7 @@
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/irc/core/irc.h>
 #include <irssi/src/fe-common/core/themes.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -38,6 +39,9 @@
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
 	char *irssi_argv[] = {*argv[0], "--home", "/tmp/irssi", NULL};
 	int irssi_argc = sizeof(irssi_argv) / sizeof(char *) - 1;
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	g_log_set_null_logger();
+#endif
 	core_register_options();
 	fe_common_core_register_options();
 	args_execute(irssi_argc, irssi_argv);

src/fe-fuzz/irc/core/Makefile.am

@@ -22,6 +22,7 @@ LDADD = \
 	$(FUZZER_LIBS)
 
 event_get_params_fuzz_SOURCES = \
+        ../../null-logger.c \
         event-get-params.c \
 	$(top_srcdir)/src/fe-text/module-formats.c
 

src/fe-fuzz/irc/core/event-get-params.c

@@ -28,6 +28,7 @@
 #include <irssi/src/core/args.h>
 #include <irssi/src/fe-common/core/printtext.h>
 #include <irssi/src/irc/core/irc.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -35,6 +36,9 @@
 #include <string.h>
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	g_log_set_null_logger();
+#endif
 	core_register_options();
 	fe_common_core_register_options();
 	/* no args */

src/fe-fuzz/irc/core/meson.build

@@ -2,6 +2,7 @@
 
 executable('event-get-params-fuzz',
   files(
+    '../../null-logger.c',
     'event-get-params.c',
     '../../../fe-text/module-formats.c',
   ),

src/fe-fuzz/irssi.c

@@ -27,6 +27,7 @@
 #include <irssi/src/fe-common/core/fe-common-core.h>
 #include <irssi/src/core/args.h>
 #include <irssi/src/fe-common/core/printtext.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -34,6 +35,9 @@
 #include <string.h>
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	g_log_set_null_logger();
+#endif
 	core_register_options();
 	fe_common_core_register_options();
 	/* no args */

src/fe-fuzz/meson.build

@@ -5,6 +5,7 @@ subdir('fe-common')
 
 executable('irssi-fuzz',
   files(
+    'null-logger.c',
     'irssi.c',
     '../fe-text/module-formats.c',
   ),
@@ -23,6 +24,7 @@ executable('irssi-fuzz',
 
 executable('server-fuzz',
   files(
+    'null-logger.c',
     'server.c',
     '../fe-text/module-formats.c',
   ),
@@ -44,5 +46,6 @@ executable('server-fuzz',
 )
 
 # noinst_headers = files(
+#   'null-logger.h',
 #   '../fe-text/module-formats.h',
 # )

src/fe-fuzz/null-logger.c

@@ -0,0 +1,16 @@
+#include <irssi/src/fe-fuzz/null-logger.h>
+
+#include <glib.h>
+
+static void null_logger(const gchar *log_domain,
+			GLogLevelFlags log_level,
+			const gchar *message,
+			gpointer user_data)
+{
+	return;
+}
+
+void g_log_set_null_logger(void)
+{
+	g_log_set_default_handler(null_logger, NULL);
+}

src/fe-fuzz/null-logger.h

@@ -0,0 +1,6 @@
+#ifndef IRSSI_FE_FUZZ_NULL_LOGGER_H
+#define IRSSI_FE_FUZZ_NULL_LOGGER_H
+
+void g_log_set_null_logger(void);
+
+#endif

src/fe-fuzz/server.c

@@ -41,6 +41,7 @@
 #include <irssi/src/irc/core/irc.h>
 #include <irssi/src/irc/core/irc-servers.h>
 #include <irssi/src/irc/core/irc-channels.h>
+#include <irssi/src/fe-fuzz/null-logger.h>
 
 /* irc.c */
 void irc_init(void);
@@ -143,6 +144,9 @@ void test_server() {
 }
 
 int LLVMFuzzerInitialize(int *argc, char ***argv) {
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+	g_log_set_null_logger();
+#endif
 	core_register_options();
 	fe_common_core_register_options();
 	/* no args */