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

Fix bytes_repr_len() to correctly handle a zero-length FT_BYTES field 

svn path=/trunk/; revision=19863
This commit is contained in:
Guy Harris 2006-11-07 20:30:34 +00:00
parent 4c2f1f7ccb
commit 5123a82b3c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/ftypes/ftype-bytes.c
View File

@ -70,9 +70,15 @@ bytes_fvalue_set(fvalue_t *fv, gpointer value, gboolean already_copied)
static int
bytes_repr_len(fvalue_t *fv, ftrepr_t rtype _U_)
{
/* 3 bytes for each byte of the byte "NN:" minus 1 byte
* as there's no trailing ":". */
return fv->value.bytes->len * 3 - 1;
if (fv->value.bytes->len == 0) {
/* Empty array of bytes, so the representation
* is an empty string. */
return 0;
} else {
/* 3 bytes for each byte of the byte "NN:" minus 1 byte
* as there's no trailing ":". */
return fv->value.bytes->len * 3 - 1;
}
}
static int