diff options
author | Pascal Quantin <pascal@wireshark.org> | 2019-10-23 11:26:14 +0200 |
---|---|---|
committer | Pascal Quantin <pascal@wireshark.org> | 2019-10-23 20:16:32 +0000 |
commit | eb4e83d5891165ca1f958cf57641200a8cb5a0b4 (patch) | |
tree | 8bc0397f99372e3447fda604946bf6dc6f7e6e77 /epan/dissectors/packet-s1ap.c | |
parent | e50fd8b6088e3f5852802363e5abc792ea91d394 (diff) |
asn2wrs.py: fix parsing of integer unions with extension
When parsing the description
ExpectedActivityPeriod ::= INTEGER (1..30|40|50|60|80|100|120|150|180|181,...)
asn2wrs.py was generating some code where the has_extension flag was
wrongly set to false, leading to a decoding error.
Bug: 16145
Change-Id: I0d54994c0656f5b48f3dcd1864218c45a4ebc308
Reviewed-on: https://code.wireshark.org/review/34837
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-s1ap.c')
-rw-r--r-- | epan/dissectors/packet-s1ap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index c9f8125a83..1f3d0df9e7 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -5914,7 +5914,7 @@ dissect_s1ap_EUTRANRoundTripDelayEstimationInfo(tvbuff_t *tvb _U_, int offset _U static int dissect_s1ap_ExpectedActivityPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 181U, NULL, FALSE); + 1U, 181U, NULL, TRUE); return offset; } @@ -5924,7 +5924,7 @@ dissect_s1ap_ExpectedActivityPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ static int dissect_s1ap_ExpectedIdlePeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 1U, 181U, NULL, FALSE); + 1U, 181U, NULL, TRUE); return offset; } |