diff options
| author | Björn Gustavsson <[email protected]> | 2013-12-02 12:48:04 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-12-02 12:48:04 +0100 |
| commit | 026a9226fcd47d29870f5b5d879919ce4f60d785 (patch) | |
| tree | 1b2d9a4dce91b4bcaa6af9e3df66c6853d83a616 | |
| parent | 22f1c2d08701038b52099dc09b52e5b94a6f8fba (diff) | |
| parent | 8d48725f062b16d94fc3371d2940d451b94a141d (diff) | |
| download | otp-026a9226fcd47d29870f5b5d879919ce4f60d785.tar.gz otp-026a9226fcd47d29870f5b5d879919ce4f60d785.tar.bz2 otp-026a9226fcd47d29870f5b5d879919ce4f60d785.zip | |
Merge branch 'maint'
* maint:
PER/UPER: Handle a range in the extension part of the constraint
| -rw-r--r-- | lib/asn1/src/asn1ct_imm.erl | 6 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE_data/Constraints.py | 3 | ||||
| -rw-r--r-- | lib/asn1/test/testConstraints.erl | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1ct_imm.erl b/lib/asn1/src/asn1ct_imm.erl index 20785cda8c..047156fc10 100644 --- a/lib/asn1/src/asn1ct_imm.erl +++ b/lib/asn1/src/asn1ct_imm.erl @@ -2155,8 +2155,10 @@ fixup_put_bits(Other) -> per_fixup(Other). %% returns a value range that has the lower bound set to the lowest value %% of all single values and lower bound values in C and the upper bound to %% the greatest value. -effective_constraint(integer,[C={{_,_},_}|_Rest]) -> % extension - [C]; +effective_constraint(integer, [{{_,_}=Root,_}|_Rest]) -> + %% Normalize extension. Note that any range given for the + %% extension should be ignored anyway. + [{Root,[]}]; effective_constraint(integer, C) -> SVs = get_constraints(C, 'SingleValue'), SV = effective_constr('SingleValue', SVs), diff --git a/lib/asn1/test/asn1_SUITE_data/Constraints.py b/lib/asn1/test/asn1_SUITE_data/Constraints.py index 864a471b88..c3b3aebd6d 100644 --- a/lib/asn1/test/asn1_SUITE_data/Constraints.py +++ b/lib/asn1/test/asn1_SUITE_data/Constraints.py @@ -16,6 +16,9 @@ SemiConstrained ::= INTEGER (100..MAX) NegSemiConstrained ::= INTEGER (-128..MAX) SemiConstrainedExt ::= INTEGER (42..MAX, ...) NegSemiConstrainedExt ::= INTEGER (-128..MAX, ...) +-- Extensions -- +LongLongExt ::= INTEGER (0..18446744073709551615, ..., -5000..-1) +Range256to65536Ext ::= INTEGER (256..65536, ..., 1000000..9000000) -- Union of single values Sv1 ::= INTEGER (2|3|17) diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl index 23322f5e88..54ba748519 100644 --- a/lib/asn1/test/testConstraints.erl +++ b/lib/asn1/test/testConstraints.erl @@ -70,6 +70,8 @@ int_constraints(Rules) -> %%========================================================== LastNumWithoutLengthEncoding = 65536, roundtrip('Range256to65536', LastNumWithoutLengthEncoding), + roundtrip('Range256to65536Ext', LastNumWithoutLengthEncoding), + roundtrip('Range256to65536Ext', 42), FirstNumWithLengthEncoding = 65537, roundtrip('LargeConstraints', 'RangeMax', FirstNumWithLengthEncoding), @@ -95,6 +97,8 @@ int_constraints(Rules) -> %% Random number within longlong range LongLong = 12672809400538808320, roundtrip('LongLong', LongLong), + roundtrip('LongLongExt', LongLong), + roundtrip('LongLongExt', -10000), %%========================================================== %% Constraint Combinations (Duboisson p. 285) |