From c7e42be2e5baf0a5f351b126cdac5c3d6d9241a0 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 27 Oct 2015 17:41:23 -0700 Subject: Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris --- tfshark.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tfshark.c') diff --git a/tfshark.c b/tfshark.c index 47053cac99..79ade49198 100644 --- a/tfshark.c +++ b/tfshark.c @@ -968,7 +968,9 @@ DIAG_ON(cast-qual) "-G" flag, as the "-G" flag dumps information registered by the dissectors, and we must do it before we read the preferences, in case any dissectors register preferences. */ - epan_init(register_all_protocols, register_all_protocol_handoffs, NULL, NULL); + if (!epan_init(register_all_protocols, register_all_protocol_handoffs, NULL, + NULL)) + return 2; /* Register all tap listeners; we do this before we parse the arguments, as the "-z" argument can specify a registered tap. */ -- cgit v1.2.3