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

If we have no value to dissect, because the AVP has the wrong length for 

the value's type, return NULL as the label, rather than returning an
uninitialized value as the label.

svn path=/trunk/; revision=35335
This commit is contained in:
Guy Harris 2011-01-03 08:21:35 +00:00
parent d7d6f8c476
commit 9c94a0e7f1
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/dissectors/packet-diameter.c
View File

@ -619,13 +619,14 @@ simple_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
static const char*
integer32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
{
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
char* label;
proto_item* pi;
/* Verify length before adding */
gint length = tvb_length_remaining(tvb,0);
if (length == 4) {
pi= proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
label = ep_alloc(ITEM_LABEL_LENGTH+1);
proto_item_fill_label(PITEM_FINFO(pi), label);
label = strstr(label,": ")+2;
}
@ -637,6 +638,7 @@ integer32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE,
"Bad Integer32 Length (%u)", length);
PROTO_ITEM_SET_GENERATED(pi);
label = NULL;
}
return label;
}
@ -644,13 +646,14 @@ integer32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
static const char*
integer64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
{
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
char* label;
proto_item* pi;
/* Verify length before adding */
gint length = tvb_length_remaining(tvb,0);
if (length == 8) {
pi= proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
label = ep_alloc(ITEM_LABEL_LENGTH+1);
proto_item_fill_label(PITEM_FINFO(pi), label);
label = strstr(label,": ")+2;
}
@ -662,6 +665,7 @@ integer64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE,
"Bad Integer64 Length (%u)", length);
PROTO_ITEM_SET_GENERATED(pi);
label = NULL;
}
return label;
}
@ -669,13 +673,14 @@ integer64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
static const char*
unsigned32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
{
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
char* label;
proto_item* pi;
/* Verify length before adding */
gint length = tvb_length_remaining(tvb,0);
if (length == 4) {
pi= proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
label = ep_alloc(ITEM_LABEL_LENGTH+1);
proto_item_fill_label(PITEM_FINFO(pi), label);
label = strstr(label,": ")+2;
}
@ -687,6 +692,7 @@ unsigned32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE,
"Bad Unsigned32 Length (%u)", length);
PROTO_ITEM_SET_GENERATED(pi);
label = NULL;
}
return label;
}
@ -694,13 +700,14 @@ unsigned32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
static const char*
unsigned64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
{
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
char* label;
proto_item* pi;
/* Verify length before adding */
gint length = tvb_length_remaining(tvb,0);
if (length == 8) {
pi= proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
label = ep_alloc(ITEM_LABEL_LENGTH+1);
proto_item_fill_label(PITEM_FINFO(pi), label);
label = strstr(label,": ")+2;
}
@ -712,6 +719,7 @@ unsigned64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE,
"Bad Unsigned64 Length (%u)", length);
PROTO_ITEM_SET_GENERATED(pi);
label = NULL;
}
return label;
}
@ -719,13 +727,14 @@ unsigned64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
static const char*
float32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
{
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
char* label;
proto_item* pi;
/* Verify length before adding */
gint length = tvb_length_remaining(tvb,0);
if (length == 4) {
pi= proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
label = ep_alloc(ITEM_LABEL_LENGTH+1);
proto_item_fill_label(PITEM_FINFO(pi), label);
label = strstr(label,": ")+2;
}
@ -737,6 +746,7 @@ float32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE,
"Bad Float32 Length (%u)", length);
PROTO_ITEM_SET_GENERATED(pi);
label = NULL;
}
return label;
}
@ -744,13 +754,14 @@ float32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
static const char*
float64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
{
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
char* label;
proto_item* pi;
/* Verify length before adding */
gint length = tvb_length_remaining(tvb,0);
if (length == 8) {
pi= proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
label = ep_alloc(ITEM_LABEL_LENGTH+1);
proto_item_fill_label(PITEM_FINFO(pi), label);
label = strstr(label,": ")+2;
}
@ -762,6 +773,7 @@ float64_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb)
expert_add_info_format(c->pinfo, pi, PI_MALFORMED, PI_NOTE,
"Bad Float64 Length (%u)", length);
PROTO_ITEM_SET_GENERATED(pi);
label = NULL;
}
return label;
}