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

ftypes: Bugfix a buffer size 

The 'size' variable is not the size of the 'mantissa_str' buffer.
'size' is the output buffer size, sizeof(mantissa_str) is fixed
at 8 bytes.
This commit is contained in:
João Valverde 2021-11-10 15:43:01 +00:00
parent 4010799cb3
commit 7630577ffa
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/ftypes/ftype-ieee-11073-float.c
View File

@ -207,8 +207,8 @@ sfloat_ieee_11073_val_to_repr(const fvalue_t *fv, ftrepr_t rtype _U_, int field_
guint16 mantissa;
guint16 mantissa_sign;
guint32 offset = 0;
#define MANTISSA_STR_BUFFER_SIZE 5
gchar mantissa_str[MANTISSA_STR_BUFFER_SIZE];
char mantissa_buf[5];
char *mantissa_str;
guint8 mantissa_digits;
if (fv->value.sfloat_ieee_11073 >= 0x07FE && fv->value.sfloat_ieee_11073 <= 0x0802) {
@ -252,7 +252,8 @@ sfloat_ieee_11073_val_to_repr(const fvalue_t *fv, ftrepr_t rtype _U_, int field_
offset += 1;
}
mantissa_digits = g_snprintf(mantissa_str, MANTISSA_STR_BUFFER_SIZE, "%u", mantissa);
mantissa_digits = g_snprintf(mantissa_buf, sizeof(mantissa_buf), "%u", mantissa);
mantissa_str = mantissa_buf;
if (exponent == 0) {
memcpy(buf + offset, mantissa_str, mantissa_digits);
@ -636,7 +637,8 @@ float_ieee_11073_val_to_repr(const fvalue_t *fv, ftrepr_t rtype _U_, int field_d
guint32 mantissa;
guint32 mantissa_sign;
guint32 offset = 0;
gchar mantissa_str[8];
char mantissa_buf[8];
char *mantissa_str;
guint8 mantissa_digits;
if (fv->value.float_ieee_11073 >= 0x007FFFFE && fv->value.float_ieee_11073 <= 0x00800002) {
@ -678,7 +680,8 @@ float_ieee_11073_val_to_repr(const fvalue_t *fv, ftrepr_t rtype _U_, int field_d
offset += 1;
}
mantissa_digits = g_snprintf(mantissa_str, size, "%u", mantissa);
mantissa_digits = g_snprintf(mantissa_buf, sizeof(mantissa_buf), "%u", mantissa);
mantissa_str = mantissa_buf;
if (exponent == 0) {
memcpy(buf + offset, mantissa_str, mantissa_digits);