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

NGAP: fix variable ‘ngap_data’ might be clobbered by ‘longjmp’ or ‘vfork’ 

Fixes #17858
This commit is contained in:
Pascal Quantin 2022-01-12 08:52:12 +01:00
parent 08f5044894
commit 5c1406971d
2 changed files with 164 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/asn1/ngap/ngap.cnf
View File

@ -288,12 +288,11 @@ UE-NGAP-IDs/aMF-UE-NGAP-ID ABBREV=AMF_UE_NGAP_ID
%(DEFAULT_BODY)s
if (ngap_dissect_container && parameter_tvb &&
tvb_reported_length(parameter_tvb) > 0) {
struct ngap_private_data *ngap_data = ngap_get_private_data(actx->pinfo);
volatile struct ngap_private_data *ngap_data = ngap_get_private_data(actx->pinfo);
/* Don't want elements inside container to write to info column */
col_set_writable(actx->pinfo->cinfo, COL_INFO, FALSE);
subtree = proto_item_add_subtree(actx->created_item, ett_ngap_SourceToTarget_TransparentContainer);
TRY {
switch(ngap_data->handover_type_value) {
case intra5gs:
case eps_to_5gs:

327
epan/dissectors/packet-ngap.c
View File

File diff suppressed because it is too large Load Diff