path: root/tshark.c
diff options
authorGuy Harris <guy@alum.mit.edu>2018-12-18 22:58:24 -0800
committerGuy Harris <guy@alum.mit.edu>2018-12-19 06:59:09 +0000
commit05b43fc5af805dde1bdbf74dd1448690f3a10705 (patch)
tree9cd2e3c74d47a13582ffb0b35dc1eb3c42b80dba /tshark.c
parent5bef36f1532f640daaf0c94e1b7744ae5fdcf999 (diff)
Clean up exp_pdu_open() API.
It really shouldn't free the comment passed to it, as the caller allocated it, and knows how to free it if necessary; it might not even have been allocated. Make the comment argument a "const char *" to 1) allow passing string constants etc. and 2) to catch any attempts to free it in exp_pdu_open(). Make the callers free it after exp_pdu_open() returns. (Alternatively, we could have exp_pdu_open() take the file name argument and generate the comment itself, so that all code paths generate the same comment.) Change-Id: I6e6924b05565761b641a6c3b4d9a2e97f4264e1b Ping-Bug: 15365 Reviewed-on: https://code.wireshark.org/review/31105 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/tshark.c b/tshark.c
index 00c28db781..e02b61b663 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1977,10 +1977,10 @@ real_main(int argc, char *argv[])
/* Activate the export PDU tap */
comment = g_strdup_printf("Dump of PDUs from %s", cf_name);
err = exp_pdu_open(&exp_pdu_tap_data, exp_fd, comment);
+ g_free(comment);
if (err != 0) {
cfile_dump_open_failure_message("TShark", exp_pdu_filename, err,
- g_free(comment);
exit_status = INVALID_EXPORT;
goto clean_exit;