aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-08-31 00:37:27 -0700
committerGuy Harris <guy@alum.mit.edu>2016-08-31 07:40:39 +0000
commitc8869f68db6cd1d4a341d57600ecf22627632c9f (patch)
treef0df24238ffe8042863ee9ef32e9e9e43977f9e5 /epan/proto.c
parent1178ee68fbbea6dc096df0d69f776a2158de630e (diff)
OK, it probably crashed in proto_initialize_all_prefixes().
Remove the debugging printouts. The changes that were committed between the last build that didn't crash and the first build that did were: commit 961f743d69b323aa217a6b39184485d6a0bfb2d5 Author: Peter Wu <peter@lekensteyn.nl> Date: Mon Aug 29 01:34:22 2016 +0200 xml: fix some memleaks No more memleaks reported for the attachment in bug 12790 :-) Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386 Ping-Bug: 12790 Reviewed-on: https://code.wireshark.org/review/17365 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> commit a04b6fcb3db901734ed948134c973996786be8b7 Author: Peter Wu <peter@lekensteyn.nl> Date: Sun Aug 28 22:19:29 2016 +0200 diameter: fix 400kb leaked memory on exit Before: SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s). After addressing to-do by calling ddict_free: SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s). After fixing all remaining leaks cases in the flex file for diameter: SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s). Not bad huh :-) Ping-Bug: 12790 Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771 Reviewed-on: https://code.wireshark.org/review/17364 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> commit 14312835c63a3e2ec9d311ed1ffee5285141f4f9 Author: Peter Wu <peter@lekensteyn.nl> Date: Sun Aug 28 19:20:59 2016 +0200 pcapng: do not leak blocks pcapng_open and pcapng_read have 'wblock' allocated on the stack, so if they return, they do not have to set wblock.block to NULL. pcapng_read_block always sets wblock->block to NULL and may initialize it for SHB, IDB, NRB and ISB. Be sure to release the memory for IDB and ISB. It is better to have more wtap_block_free calls on a NULL value than missing them as this would be a memleak (on the other hand, do not release memory that is stored elsewhere such as SHB and NRB). Ping-Bug: 12790 Change-Id: I081f841addb36f16e3671095a919d357f4bc16c5 Reviewed-on: https://code.wireshark.org/review/17362 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> *If* one of those is the cause, my guess is that it's the Diameter one, as the crash happens before any file is read (so it's probably not the pcapng one) and thus before any dissection is done (so it's probably not the XML dissector one). Change-Id: I816c1bbd6078eab251efd02ebb7c3195f6dd1483 Reviewed-on: https://code.wireshark.org/review/17411 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/epan/proto.c b/epan/proto.c
index 0ddbcba1db..42689a36ac 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -889,7 +889,6 @@ void
proto_register_prefix(const char *prefix, prefix_initializer_t pi ) {
if (! prefixes ) {
prefixes = g_hash_table_new(prefix_hash, prefix_equal);
-fprintf(stderr, "Created prefixes hash table: %p\n", prefixes);
}
g_hash_table_insert(prefixes, (gpointer)prefix, (gpointer)pi);
@@ -905,7 +904,6 @@ initialize_prefix(gpointer k, gpointer v, gpointer u _U_) {
/** Initialize every remaining uninitialized prefix. */
void
proto_initialize_all_prefixes(void) {
-fprintf(stderr, "proto_initialize_all_prefixes(): prefixes %p\n", prefixes);
g_hash_table_foreach_remove(prefixes, initialize_prefix, NULL);
}