diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2019-08-21 16:14:12 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-08-21 14:53:14 +0000 |
| commit | a503b80080ea83ef94ffbbe51f3f44a93a0c8109 (patch) | |
| tree | 59d1afe5ecfdbecb4c770568357d14b9527de22f | |
| parent | 02006c96786c7392acfaa1024e9fe70e88344c7b (diff) | |
GSM A DTAP: Try to ensure that global variable sccp_assoc is cleared.
Change-Id: I970e9314724c55c19d0b98578e54a5d1b598e307
Reviewed-on: https://code.wireshark.org/review/34336
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-gsm_a_common.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_dtap.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index b7df1416e3..6e95f52fc7 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -760,7 +760,7 @@ static expert_field ei_gsm_a_format_not_supported = EI_INIT; static expert_field ei_gsm_a_mobile_identity_type = EI_INIT; static expert_field ei_gsm_a_ie_length_too_short = EI_INIT; -sccp_assoc_info_t* sccp_assoc; +sccp_assoc_info_t* sccp_assoc = NULL; #define NUM_GSM_COMMON_ELEM (sizeof(gsm_common_elem_strings)/sizeof(value_string)) gint ett_gsm_common_elem[NUM_GSM_COMMON_ELEM]; diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 27c2cde468..c37dd3c500 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -7133,6 +7133,8 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) (*dtap_msg_fcn)(tvb, dtap_tree, pinfo, offset, len - offset); } + sccp_assoc = NULL; + return len; } |