summaryrefslogtreecommitdiff
path: root/mergecap.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2014-09-22 16:53:02 -0400
committerEvan Huus <eapache@gmail.com>2014-09-22 20:53:44 +0000
commitdf35a959c4c49b22e9ee23ed035b1b83eedad22d (patch)
tree27ae4a378281fd9edc2de9d19e46fe60e5a5afed /mergecap.c
parent1db95f7e4d8a308eef3d0807ae05c0192a0e0c74 (diff)
downloadwireshark-df35a959c4c49b22e9ee23ed035b1b83eedad22d.tar.gz
Ensure pcapng application name is always dynamically allocated
Change-Id: I408944dfb0fa35bae6019ed0d6d810525b2ffcae Reviewed-on: https://code.wireshark.org/review/4254 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c
index 3e26f9c682..94c8661252 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -467,7 +467,7 @@ main(int argc, char *argv[])
shb_hdr->opt_comment = comment_gstr->str; /* NULL if not available */
shb_hdr->shb_hardware = NULL; /* NULL if not available, UTF-8 string containing the description of the hardware used to create this section. */
shb_hdr->shb_os = NULL; /* NULL if not available, UTF-8 string containing the name of the operating system used to create this section. */
- shb_hdr->shb_user_appl = "mergecap"; /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
+ shb_hdr->shb_user_appl = g_strdup("mergecap"); /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
pdh = wtap_dump_fdopen_ng(out_fd, file_type, frame_type, snaplen,
FALSE /* compressed */, shb_hdr, NULL /* wtapng_iface_descriptions_t *idb_inf */, &open_err);