forked from osmocom/wireshark
erf: set USERAPPL if we have the application version but not the name.
Just say "(Unknown application) <version>".
This also means that we don't leak the app_version string if there's no
app_name string.
(cherry picked from commit 297b6c5407
)
This commit is contained in:
parent
ac7673bd0a
commit
7438c67f06
|
@ -2604,10 +2604,13 @@ static int populate_capture_host_info(erf_t *erf_priv, wtap *wth, union wtap_pse
|
||||||
|
|
||||||
/* Post processing */
|
/* Post processing */
|
||||||
|
|
||||||
if (app_name) {
|
if (app_name || app_version) {
|
||||||
/* If no app_version will just use app_name */
|
/*
|
||||||
|
* If we have no app_name, we use "(Unknown applicaton)".
|
||||||
tmp = g_strjoin(" ", app_name, app_version, NULL);
|
*
|
||||||
|
* If we have no app_version, this will just use app_name.
|
||||||
|
*/
|
||||||
|
tmp = g_strjoin(" ", app_name ? app_name : "(Unknown application)", app_version, NULL);
|
||||||
wtap_block_set_string_option_value(shb_hdr, OPT_SHB_USERAPPL, tmp, strlen(tmp));
|
wtap_block_set_string_option_value(shb_hdr, OPT_SHB_USERAPPL, tmp, strlen(tmp));
|
||||||
g_free(tmp);
|
g_free(tmp);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue