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

Don't use proto_tree_add_uint() to add FT_BOOLEAN values. 

In proto_item_add_bitmask_tree(), if use_value is true, base the routine
we use to add the item to the tree on the type of the field being added.

Also, use DISSECTOR_ASSERT_NOT_REACHED(), not g_assert_not_reached(), to
catch types that aren't integral or Boolean.

Change-Id: I6ff9867bddcae16ddf8b689b48fdc93c6f949105
Reviewed-on: https://code.wireshark.org/review/8127
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-04-19 14:26:54 -07:00
parent 9194aab0ab
commit 1edbd5a875
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
epan/proto.c
View File

@ -8100,10 +8100,37 @@ proto_item_add_bitmask_tree(proto_item *item, tvbuff_t *tvb, const int offset,
if (use_value)
{
if (len <= 4)
switch (hf->type) {
case FT_INT8:
case FT_UINT8:
case FT_INT16:
case FT_UINT16:
case FT_INT24:
case FT_UINT24:
case FT_INT32:
case FT_UINT32:
proto_tree_add_uint(tree, **fields, tvb, offset, len, (guint32)value);
else
break;
case FT_INT40:
case FT_UINT40:
case FT_INT48:
case FT_UINT48:
case FT_INT56:
case FT_UINT56:
case FT_INT64:
case FT_UINT64:
proto_tree_add_uint64(tree, **fields, tvb, offset, len, value);
break;
case FT_BOOLEAN:
proto_tree_add_boolean(tree, **fields, tvb, offset, len, (guint32)value);
break;
default:
DISSECTOR_ASSERT_NOT_REACHED();
break;
}
}
else
{
@ -8184,7 +8211,8 @@ proto_item_add_bitmask_tree(proto_item *item, tvbuff_t *tvb, const int offset,
}
break;
default:
g_assert_not_reached();
DISSECTOR_ASSERT_NOT_REACHED();
break;
}
fields++;