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

From Pascal Quantin via bug 5301: 

Add expert info when ASN.1 PER constrained integer does not match range.

svn path=/trunk/; revision=34531
This commit is contained in:
Stig Bjørlykke 2010-10-17 11:59:10 +00:00
parent 9d253d77ad
commit 38ba5119cd
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-per.c
View File

@ -1384,8 +1384,14 @@ DEBUG_ENTRY("dissect_per_constrained_integer");
timeval.secs = val;
if (IS_FT_UINT(hfi->type)) {
it = proto_tree_add_uint(tree, hf_index, tvb, val_start, val_length, val);
if (val > max) {
expert_add_info_format(actx->pinfo, it, PI_MALFORMED, PI_ERROR, "Constrained integer value %u is out of [%u..%u] range", val, min, max);
}
} else if (IS_FT_INT(hfi->type)) {
it = proto_tree_add_int(tree, hf_index, tvb, val_start, val_length, val);
if ((gint32)val > (gint32)max) {
expert_add_info_format(actx->pinfo, it, PI_MALFORMED, PI_ERROR, "Constrained integer value %d is out of [%d..%d] range", (gint32)val, (gint32)min, (gint32)max);
}
} else if (IS_FT_TIME(hfi->type)) {
it = proto_tree_add_time(tree, hf_index, tvb, val_start, val_length, &timeval);
} else {
@ -1585,8 +1591,16 @@ DEBUG_ENTRY("dissect_per_constrained_integer_64b");
if (IS_FT_UINT(hfi->type)) {
it = proto_tree_add_uint64(tree, hf_index, tvb, val_start, val_length, val);
if (val > max) {
expert_add_info_format(actx->pinfo, it, PI_MALFORMED, PI_ERROR, "Constrained integer value %" G_GINT64_MODIFIER
"u is out of [%" G_GINT64_MODIFIER "u..%" G_GINT64_MODIFIER "u] range", val, min, max);
}
} else if (IS_FT_INT(hfi->type)) {
it = proto_tree_add_int64(tree, hf_index, tvb, val_start, val_length, val);
if ((gint64)val > (gint64)max) {
expert_add_info_format(actx->pinfo, it, PI_MALFORMED, PI_ERROR, "Constrained integer value %" G_GINT64_MODIFIER
"d is out of [%" G_GINT64_MODIFIER "d..%" G_GINT64_MODIFIER "d] range", (gint64)val, (gint64)min, (gint64)max);
}
} else if (IS_FT_TIME(hfi->type)) {
timeval.secs = (guint32)val;
it = proto_tree_add_time(tree, hf_index, tvb, val_start, val_length, &timeval);