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

Fixes for sfloat_ieee_11073_val_to_repr() function 

- when having a special value, leave function once buffer is written
- give the right buffer length to g_snprintf() function

Bug: 13590
Change-Id: Iecf1456686b6e92a7cfcf8ed6d8619541ad50ace
Reviewed-on: https://code.wireshark.org/review/21260
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Pascal Quantin 2017-04-20 23:15:38 +02:00 committed by Michael Mann
parent 70b6e406e7
commit a967ca5074
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,8 @@ sfloat_ieee_11073_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_displa
guint16 mantissa;
guint16 mantissa_sign;
guint32 offset = 0;
gchar mantissa_str[5];
#define MANTISSA_STR_BUFFER_SIZE 5
gchar mantissa_str[MANTISSA_STR_BUFFER_SIZE];
guint8 mantissa_digits;
if (fv->value.sfloat_ieee_11073 >= 0x07FE && fv->value.sfloat_ieee_11073 <= 0x0802) {
@ -240,6 +241,7 @@ sfloat_ieee_11073_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_displa
g_strlcpy(buf, "-INFINITY", size);
break;
}
return;
}
exponent = fv->value.sfloat_ieee_11073 >> 12;
@ -262,7 +264,7 @@ sfloat_ieee_11073_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_displa
offset += 1;
}
mantissa_digits = g_snprintf(mantissa_str, size, "%u", mantissa);
mantissa_digits = g_snprintf(mantissa_str, MANTISSA_STR_BUFFER_SIZE, "%u", mantissa);
if (exponent == 0) {
memcpy(buf + offset, mantissa_str, mantissa_digits);