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

EAP: fix Argument with 'nonnull' attribute passed null

This commit is contained in:
Alexis La Goutte 2022-01-31 11:53:58 +00:00 committed by A Wireshark GitLab Utility
parent 38d5d79d74
commit 6d063e0190
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
epan/dissectors/packet-eap.c
View File

@ -1006,29 +1006,31 @@ dissect_eap_identity_wlan(tvbuff_t *tvb, packet_info* pinfo, proto_tree* tree, i
}
/* Handle encrypted IMSI indices first */
if (enc_imsi) {
/* Add MNC to tree */
proto_tree_add_uint(eap_identity_tree, hf_eap_identity_mcc_mnc, tvb,
offset + 1 + (guint)strlen(tokens[0]) + 1 + (guint)strlen(tokens[1]) + 1 +
(guint)strlen("Realm=@wlan.mnc"), (guint)strlen(realm_tokens[2]) -
(guint)strlen("mnc"), mcc_mnc);
/* Add MCC to tree */
proto_tree_add_uint(eap_identity_tree, hf_eap_identity_mcc, tvb,
offset + 1 + (guint)strlen(tokens[0]) + 1 + (guint)strlen(tokens[1]) + 1 +
(guint)strlen(realm_tokens[0]) + (guint)strlen("@wlan.") +
(guint)strlen(realm_tokens[2]) + (guint)strlen(".mcc"),
(guint)strlen(realm_tokens[3]) - (guint)strlen("mcc"), mcc);
} else {
/* Add MNC to tree */
proto_tree_add_uint(eap_identity_tree, hf_eap_identity_mcc_mnc,
tvb, offset + (guint)strlen(tokens[0]) + (guint)strlen("@wlan.") +
(guint)strlen("mnc"), (guint)strlen(realm_tokens[1]) - (guint)strlen("mnc"),
mcc_mnc);
/* Add MCC to tree */
proto_tree_add_uint(eap_identity_tree, hf_eap_identity_mcc,
tvb, offset + (guint)(strlen(tokens[0]) + (guint)strlen("@wlan.") +
(guint)strlen(realm_tokens[1]) + 1 + strlen("mcc")),
(guint)strlen(realm_tokens[2]) - (guint)strlen("mcc"), mcc);
if(realm_tokens[0] && realm_tokens[1] && realm_tokens[2] && realm_tokens[3]) {
if (enc_imsi) {
/* Add MNC to tree */
proto_tree_add_uint(eap_identity_tree, hf_eap_identity_mcc_mnc, tvb,
offset + 1 + (guint)strlen(tokens[0]) + 1 + (guint)strlen(tokens[1]) + 1 +
(guint)strlen("Realm=@wlan.mnc"), (guint)strlen(realm_tokens[2]) -
(guint)strlen("mnc"), mcc_mnc);
/* Add MCC to tree */
proto_tree_add_uint(eap_identity_tree, hf_eap_identity_mcc, tvb,
offset + 1 + (guint)strlen(tokens[0]) + 1 + (guint)strlen(tokens[1]) + 1 +
(guint)strlen(realm_tokens[0]) + (guint)strlen("@wlan.") +
(guint)strlen(realm_tokens[2]) + (guint)strlen(".mcc"),
(guint)strlen(realm_tokens[3]) - (guint)strlen("mcc"), mcc);
} else {
/* Add MNC to tree */
proto_tree_add_uint(eap_identity_tree, hf_eap_identity_mcc_mnc,
tvb, offset + (guint)strlen(tokens[0]) + (guint)strlen("@wlan.") +
(guint)strlen("mnc"), (guint)strlen(realm_tokens[1]) - (guint)strlen("mnc"),
mcc_mnc);
/* Add MCC to tree */
proto_tree_add_uint(eap_identity_tree, hf_eap_identity_mcc,
tvb, offset + (guint)(strlen(tokens[0]) + (guint)strlen("@wlan.") +
(guint)strlen(realm_tokens[1]) + 1 + strlen("mcc")),
(guint)strlen(realm_tokens[2]) - (guint)strlen("mcc"), mcc);
}
}
end: