osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wiretap: Validate UTF-8 encoding for pcapng 

Validate UTF-8 encoding for pcapng string options. To
avoid two unnecessary memory allocations for invalid strings and
make the code cleaner a new wtap_block_add_string_option_owned()
function is used.

Add UTF-8 debug check for wiretap API.

Fixes #18703.
This commit is contained in:
João Valverde 2022-12-06 19:27:24 +00:00
parent c64eaf87af
commit a74027ad00
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wiretap/pcapng.c
View File

@ -700,7 +700,17 @@ void
pcapng_process_string_option(wtapng_block_t *wblock, guint16 option_code,
guint16 option_length, const guint8 *option_content)
{
wtap_block_add_string_option(wblock->block, option_code, (const char *)option_content, option_length);
const char *opt = (const char *)option_content;
size_t optlen = option_length;
char *str;
/* Validate UTF-8 encoding. */
if (g_utf8_validate(opt, optlen, NULL))
str = g_strndup(opt, optlen);
else
str = g_utf8_make_valid(opt, optlen);
wtap_block_add_string_option_owned(wblock->block, option_code, str);
}
void

17
wiretap/wtap_opttypes.c
View File

@ -19,6 +19,7 @@
#include <wsutil/glib-compat.h>
#include <wsutil/inet_ipv6.h>
#include <wsutil/unicode-utils.h>
#if 0
#define wtap_debug(...) ws_warning(__VA_ARGS__)
@ -942,6 +943,21 @@ wtap_block_add_string_option(wtap_block_t block, guint option_id, const char *va
if (ret != WTAP_OPTTYPE_SUCCESS)
return ret;
opt->value.stringval = g_strndup(value, value_length);
WS_UTF_8_CHECK(opt->value.stringval, -1);
return WTAP_OPTTYPE_SUCCESS;
}
wtap_opttype_return_val
wtap_block_add_string_option_owned(wtap_block_t block, guint option_id, char *value)
{
wtap_opttype_return_val ret;
wtap_option_t *opt;
ret = wtap_block_add_option_common(block, option_id, WTAP_OPTTYPE_STRING, &opt);
if (ret != WTAP_OPTTYPE_SUCCESS)
return ret;
opt->value.stringval = value;
WS_UTF_8_CHECK(opt->value.stringval, -1);
return WTAP_OPTTYPE_SUCCESS;
}
@ -955,6 +971,7 @@ wtap_block_add_string_option_vformat(wtap_block_t block, guint option_id, const
if (ret != WTAP_OPTTYPE_SUCCESS)
return ret;
opt->value.stringval = ws_strdup_vprintf(format, va);
WS_UTF_8_CHECK(opt->value.stringval, -1);
return WTAP_OPTTYPE_SUCCESS;
}

11
wiretap/wtap_opttypes.h
View File

@ -782,6 +782,17 @@ wtap_block_get_ipv6_option_value(wtap_block_t block, guint option_id, ws_in6_add
WS_DLL_PUBLIC wtap_opttype_return_val
wtap_block_add_string_option(wtap_block_t block, guint option_id, const char *value, gsize value_length);
/** Add a string option to a block taking ownership of the null-terminated string.
*
* @param[in] block Block to which to add the option
* @param[in] option_id Identifier value for option
* @param[in] value Value of option
* @return wtap_opttype_return_val - WTAP_OPTTYPE_SUCCESS if successful,
* error code otherwise
*/
WS_DLL_PUBLIC wtap_opttype_return_val
wtap_block_add_string_option_owned(wtap_block_t block, guint option_id, char *value);
/** Add a string option to a block with a printf-formatted string as its value
*
* @param[in] block Block to which to add the option