osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wsutil: Add max length argument to bytes_to_str()

This commit is contained in:
João Valverde 2021-07-26 23:32:14 +01:00 committed by Wireshark GitLab Utility
parent 1ff6cc7b27
commit f0b02dd0ff
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/libwsutil0.symbols vendored
View File

@ -10,8 +10,8 @@ libwsutil.so.0 libwsutil0 #MINVER#
bitswap_buf_inplace@Base 1.12.0~rc1
bytes_to_hexstr@Base 3.5.0
bytes_to_hexstr_punct@Base 3.5.0
bytes_to_str@Base 3.5.0
bytestring_to_str@Base 3.5.0
bytes_to_str_max@Base 3.5.0
bytestring_to_str_max@Base 3.5.0
codec_decode@Base 3.1.0
codec_get_channels@Base 3.1.0
codec_get_frequency@Base 3.1.0

29
wsutil/to_str.c
View File

@ -94,9 +94,6 @@ bytes_to_hexstr_punct(char *out, const guint8 *ad, size_t len, char punct)
return out;
}
/* Max string length for displaying byte string. */
#define MAX_BYTE_STR_LEN 72
/* Routine to convert a sequence of bytes to a hex string, one byte/two hex
* digits at at a time, with a specified punctuation character between
* the bytes.
@ -105,7 +102,7 @@ bytes_to_hexstr_punct(char *out, const guint8 *ad, size_t len, char punct)
* the resulting string is (len-1) bytes shorter)
*/
gchar *
bytestring_to_str(wmem_allocator_t *scope, const guint8 *ad, size_t len, const char punct)
bytestring_to_str_max(wmem_allocator_t *scope, const guint8 *ad, size_t len, const char punct, size_t max)
{
gchar *buf;
size_t buflen = len;
@ -123,15 +120,18 @@ bytestring_to_str(wmem_allocator_t *scope, const guint8 *ad, size_t len, const c
}
if (!punct)
return bytes_to_str(scope, ad, len);
return bytes_to_str_max(scope, ad, len, max);
buf=(gchar *)wmem_alloc(scope, MAX_BYTE_STR_LEN+3+1);
if (buflen > MAX_BYTE_STR_LEN/3) { /* bd_len > 16 */
if (max > len * 3)
max = len * 3;
buf=(gchar *)wmem_alloc(scope, max+3+1);
if (buflen > max/3) {
truncated = 1;
buflen = MAX_BYTE_STR_LEN/3;
buflen = max/3;
}
buf_ptr = bytes_to_hexstr_punct(buf, ad, buflen, punct); /* max MAX_BYTE_STR_LEN-1 bytes */
buf_ptr = bytes_to_hexstr_punct(buf, ad, buflen, punct); /* maximum max-1 bytes */
if (truncated) {
*buf_ptr++ = punct; /* 1 byte */
@ -143,7 +143,7 @@ bytestring_to_str(wmem_allocator_t *scope, const guint8 *ad, size_t len, const c
}
char *
bytes_to_str(wmem_allocator_t *scope, const guint8 *bd, size_t bd_len)
bytes_to_str_max(wmem_allocator_t *scope, const guint8 *bd, size_t bd_len, size_t max)
{
gchar *cur;
gchar *cur_ptr;
@ -159,10 +159,13 @@ bytes_to_str(wmem_allocator_t *scope, const guint8 *bd, size_t bd_len)
return wmem_strdup(scope, "(null pointer)");
}
cur=(gchar *)wmem_alloc(scope, MAX_BYTE_STR_LEN+3+1);
if (bd_len > MAX_BYTE_STR_LEN/2) { /* bd_len > 24 */
if (max > bd_len * 2)
max = bd_len * 2;
cur=(gchar *)wmem_alloc(scope, max+3+1);
if (bd_len > max/2) {
truncated = 1;
bd_len = MAX_BYTE_STR_LEN/2;
bd_len = max/2;
}
cur_ptr = bytes_to_hexstr(cur, bd, bd_len); /* max MAX_BYTE_STR_LEN bytes */

13
wsutil/to_str.h
View File

@ -43,6 +43,9 @@ WS_DLL_PUBLIC char *bytes_to_hexstr(char *out, const guint8 *ad, size_t len);
*/
WS_DLL_PUBLIC char *bytes_to_hexstr_punct(char *out, const guint8 *ad, size_t len, char punct);
/* Max string length for displaying byte string. */
#define MAX_BYTE_STR_LEN 72
/** Turn an array of bytes into a string showing the bytes in hex,
* separated by a punctuation character.
*
@ -50,20 +53,26 @@ WS_DLL_PUBLIC char *bytes_to_hexstr_punct(char *out, const guint8 *ad, size_t le
* @param ad A pointer to the byte array
* @param len The length of the byte array
* @param punct The punctuation character
* @param max Maximum string length, plus ellipsis if present
* @return A pointer to the formatted string
*
* @see bytes_to_str()
*/
WS_DLL_PUBLIC gchar *bytestring_to_str(wmem_allocator_t *scope, const guint8 *ad, size_t len, const char punct);
WS_DLL_PUBLIC gchar *bytestring_to_str_max(wmem_allocator_t *scope, const guint8 *ad, size_t len, const char punct, size_t max);
#define bytestring_to_str(scope, ad, len, punct) bytestring_to_str_max(scope, ad, len, punct, MAX_BYTE_STR_LEN)
/** Turn an array of bytes into a string showing the bytes in hex.
*
* @param scope memory allocation scheme used
* @param bd A pointer to the byte array
* @param bd_len The length of the byte array
* @param max Maximum string length, plus ellipsis if present
* @return A pointer to the formatted string
*/
WS_DLL_PUBLIC char *bytes_to_str(wmem_allocator_t *scope, const guint8 *bd, size_t bd_len);
WS_DLL_PUBLIC char *bytes_to_str_max(wmem_allocator_t *scope, const guint8 *bd, size_t bd_len, size_t max);
#define bytes_to_str(scope, bd, len) bytes_to_str_max(scope, bd, len, MAX_BYTE_STR_LEN)
#ifdef __cplusplus
}