From df35a959c4c49b22e9ee23ed035b1b83eedad22d Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Mon, 22 Sep 2014 16:53:02 -0400 Subject: Ensure pcapng application name is always dynamically allocated Change-Id: I408944dfb0fa35bae6019ed0d6d810525b2ffcae Reviewed-on: https://code.wireshark.org/review/4254 Reviewed-by: Evan Huus --- editcap.c | 2 +- mergecap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/editcap.c b/editcap.c index 2c7ca66128..199fac3a59 100644 --- a/editcap.c +++ b/editcap.c @@ -1308,7 +1308,7 @@ main(int argc, char *argv[]) /* If we don't have an application name add Editcap */ if (shb_hdr->shb_user_appl == NULL) { - shb_hdr->shb_user_appl = "Editcap " VERSION; + shb_hdr->shb_user_appl = g_strdup("Editcap " VERSION); } pdh = wtap_dump_open_ng(filename, out_file_type_subtype, out_frame_type, 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); -- cgit v1.2.1