diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-09-28 16:16:37 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-09-28 16:16:37 +0000 |
| commit | f6ef22c553bea7cfbdc19460d3cc720470b1c7cd (patch) | |
| tree | 4e08a5b99702220fe50cd42f9c05cf1228acae04 /epan/dissectors/packet-frame.c | |
| parent | e2d774be167d2ff4d2759c5218b49def4ba7e265 (diff) | |
Have show_exception() take a "const char *" as its exception message,
and not free the string to which it points. Pass to
REPORT_DISSECTOR_BUG() strings allocated with ep_strdup_printf(), so
that they're freed automatically.
svn path=/trunk/; revision=16039
Diffstat (limited to 'epan/dissectors/packet-frame.c')
| -rw-r--r-- | epan/dissectors/packet-frame.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index c91ff5519d..74a8769c54 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -261,7 +261,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) void show_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - unsigned long exception, char *exception_message) + unsigned long exception, const char *exception_message) { static const char dissector_error_nomsg[] = "Dissector writer didn't bother saying what the error was"; @@ -306,8 +306,6 @@ show_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, "%s", exception_message == NULL ? dissector_error_nomsg : exception_message); - if (exception_message != NULL) - g_free(exception_message); break; default: |