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

FPP: Add null pointer checks. 

Add a couple of null pointer checks. Followup to #18043.
This commit is contained in:
Gerald Combs 2022-04-19 10:04:33 -07:00 committed by A Wireshark GitLab Utility
parent 88f07ff5d1
commit 51f5bdc287
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/.editorconfig
View File

@ -746,10 +746,6 @@ indent_size = tab
indent_style = tab
indent_size = tab
[packet-fpp.[ch]]
indent_style = tab
indent_size = tab
[packet-fr.[ch]]
indent_size = 2

5
epan/dissectors/packet-fpp.c
View File

@ -517,6 +517,7 @@ dissect_preemption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
/* will be used for seeding the crc calculation */
if (!PINFO_FD_VISITED(pinfo)) {
conv = conversation_new_by_id(pinfo->num, ENDPOINT_NONE, interface_id | packet_direction, 0);
/* XXX Is this needed? */
find_conversation_pinfo(pinfo, 0);
}
}
@ -549,7 +550,7 @@ dissect_preemption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
if (pck_type == FPP_Packet_Init) {
/* Add data to this new conversation during first iteration*/
if (!PINFO_FD_VISITED(pinfo)) {
if (conv && !PINFO_FD_VISITED(pinfo)) {
ctx = wmem_new(wmem_file_scope(), struct _fpp_ctx_t);
init_fpp_ctx(ctx, get_cont_by_start(smd2), crc);
ctx->size = frag_size;
@ -561,7 +562,7 @@ dissect_preemption(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
end of continuation */
drop_fragments(pinfo);
if (!PINFO_FD_VISITED(pinfo)) {
if (conv && !PINFO_FD_VISITED(pinfo)) {
drop_conversation(conv);
}