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

PER: Add a couple of NULL checks. 

Check for NULLs in a couple of places found by scan-build. Fix a typo.

Change-Id: Idde75db6031fa9f2ffa36b7fa10b37bf676e0904
Reviewed-on: https://code.wireshark.org/review/35427
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2019-12-12 11:47:26 -08:00 committed by Anders Broman
parent 2629bd2081
commit dd1daa41cd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1812,10 +1812,14 @@ index_get_extension_name(const per_sequence_t *sequence, int idx)
static const char *
index_get_field_name(const per_sequence_t *sequence, int idx)
{
header_field_info *hfi;
if (sequence) {
header_field_info *hfi = proto_registrar_get_nth(*sequence[idx].p_id);
hfi = proto_registrar_get_nth(*sequence[idx].p_id);
return (hfi) ? hfi->name : "<unknown filed>";
if (hfi) {
return hfi->name;
}
}
return "<unknown field>";
}
/* this functions decodes a SEQUENCE
@ -1841,6 +1845,7 @@ dissect_per_sequence(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree
guint32 optional_mask[SEQ_MAX_COMPONENTS>>5];
DEBUG_ENTRY("dissect_per_sequence");
DISSECTOR_ASSERT(sequence);
item=proto_tree_add_item(parent_tree, hf_index, tvb, offset>>3, 0, ENC_BIG_ENDIAN);
tree=proto_item_add_subtree(item, ett_index);