aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-frame.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2005-08-06 03:43:42 +0000
committerGerald Combs <gerald@wireshark.org>2005-08-06 03:43:42 +0000
commitb992c7339116ada28b7021349a6dbea9f023ded0 (patch)
treed34048dd20602ebb2a1ccafb954bec0bfe7c2e4a /epan/dissectors/packet-frame.c
parent312c524a4cb9cfc7884ed2b06aa8806a686d10a7 (diff)
In packet-frame.c, don't free static memory when we throw a
DissectorError. In packet-kerberos.c, restore pinfo->private_data if we throw an exception, which keeps the SMB dissector from throwing a DissectorError. Initialize variables in other places to squelch valgrind warnings. svn path=/trunk/; revision=15235
Diffstat (limited to 'epan/dissectors/packet-frame.c')
-rw-r--r--epan/dissectors/packet-frame.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index aa2c705b11..ba98cfde20 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -288,7 +288,6 @@ show_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
pinfo->current_proto, exception_message);
g_warning("Dissector bug, protocol %s, in packet %u: %s",
pinfo->current_proto, pinfo->fd->num, exception_message);
- g_free((void *)exception_message);
break;
default: