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

Fix several cases of writing to COL_PROTOCOL w/o checking first 

svn path=/trunk/; revision=26645
This commit is contained in:
Bill Meier 2008-10-31 14:06:20 +00:00
parent a061f50bb0
commit 186a69dd83
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-ncp-nmas.c
View File

@ -301,8 +301,10 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc
foffset += 1;
/* Fill in the INFO column. */
if (check_col(pinfo->cinfo, COL_INFO)) {
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS");
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "C NMAS - %s",
val_to_str(subfunc, nmas_func_enum, "Unknown (0x%02x)"));
}
@ -492,7 +494,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin
subverb = request_value->req_nds_flags;
msgverb = request_value->nds_request_verb;
}
if (check_col(pinfo->cinfo, COL_INFO)) {
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS");
}
if (tvb_reported_length_remaining(tvb, foffset)<4) {

8
epan/dissectors/packet-ncp-sss.c
View File

@ -579,9 +579,11 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp
subfunc = tvb_get_guint8(tvb, foffset);
foffset += 1;
/* Fill in the INFO column. */
if (check_col(pinfo->cinfo, COL_INFO)) {
/* Fill in the PROTOCOL & INFO columns. */
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSSS");
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "C SecretStore - %s", val_to_str(subfunc, sss_func_enum, "Unknown (%d)"));
}
switch (subfunc) {
@ -726,7 +728,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint
subverb = request_value->req_nds_flags;
msgverb = request_value->nds_request_verb;
}
if (check_col(pinfo->cinfo, COL_INFO)) {
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSSS");
}
if (tvb_length_remaining(tvb, foffset)<4) {