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

Fix null dereference in packet-vj-comp.c 

I missed testing that `conv` wasn't null before passing it to
`conversation_get_proto_data()`. This fixes that.

Fixes #17238.
This commit is contained in:
David Perry 2021-02-17 07:42:19 -05:00
parent 2efed17b54
commit 1965109ec7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-vj-comp.c
View File

@ -446,12 +446,14 @@ dissect_vjc_comp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void*
}
}
conv = vjc_find_conversation(pinfo, vjc_cnum, FALSE);
if (NULL == conv) {
if (NULL != conv) {
pkt_data = (vjc_conv_t *)conversation_get_proto_data(conv, proto_vjc);
// Will be testing that pkt_data exists below
}
else {
proto_tree_add_expert(ti, pinfo, &ei_vjc_no_conversation,
tvb, 1, (flags & VJC_FLAG_C) ? 1 : 0);
}
pkt_data = (vjc_conv_t *)conversation_get_proto_data(conv, proto_vjc);
// Will be testing that pkt_data exists below
proto_tree_add_item_ret_uint(subtree, hf_vjc_chksum, tvb, offset, 2,
ENC_BIG_ENDIAN, &tcp_chksum);