aboutsummaryrefslogtreecommitdiffstats
path: root/fuzz
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2021-06-24 21:20:25 +0100
committerJoão Valverde <j@v6e.pt>2021-06-26 00:18:26 +0100
commitc6a920686ce59ea8b29f7a61f8197077baedf304 (patch)
treeda6268c7e6fce9e38f99190f08fe3c08b5301b38 /fuzz
parentc2c256f0d8afa76599d7c3f3dcfac23c02069209 (diff)
wslog: Check environment initialization for errors
Initialiaze the cmdarg error stream earlier. Dumpcap also needs to know earlier if it is running in capture child mode.
Diffstat (limited to 'fuzz')
-rw-r--r--fuzz/fuzzshark.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fuzz/fuzzshark.c b/fuzz/fuzzshark.c
index c2bed25c2d..fdf25d64c3 100644
--- a/fuzz/fuzzshark.c
+++ b/fuzz/fuzzshark.c
@@ -235,10 +235,13 @@ fuzz_init(int argc _U_, char **argv)
g_setenv("WIRESHARK_DEBUG_WMEM_OVERRIDE", "simple", 0);
g_setenv("G_SLICE", "always-malloc", 0);
+ cmdarg_err_init(fuzzshark_cmdarg_err, fuzzshark_cmdarg_err_cont);
+
/* Initialize log handler early so we can have proper logging during startup. */
- ws_log_init("fuzzshark", NULL);
+ ws_log_init("fuzzshark", vcmdarg_err);
- cmdarg_err_init(fuzzshark_cmdarg_err, fuzzshark_cmdarg_err_cont);
+ /* Early logging command-line initialization. */
+ ws_log_parse_args(&argc, argv, vcmdarg_err, LOG_ARGS_NOEXIT);
/*
* Get credential information for later use, and drop privileges