aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/src/asn1ct_imm.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-12-02 12:31:11 +0100
committerBjörn Gustavsson <[email protected]>2013-12-02 12:31:11 +0100
commit8d48725f062b16d94fc3371d2940d451b94a141d (patch)
tree4107fa190707e11eff5f3c2c84066c6c95f52c73 /lib/asn1/src/asn1ct_imm.erl
parent301a7c2de81559fce4ab504afe5db68744a7c6d7 (diff)
parentbdf9ae38e1563c8304bf411c6e0655622246b20b (diff)
downloadotp-8d48725f062b16d94fc3371d2940d451b94a141d.tar.gz
otp-8d48725f062b16d94fc3371d2940d451b94a141d.tar.bz2
otp-8d48725f062b16d94fc3371d2940d451b94a141d.zip
Merge branch 'bjorn/asn1/fix-integer-constraint/OTP-11504' into maint
* bjorn/asn1/fix-integer-constraint/OTP-11504: PER/UPER: Handle a range in the extension part of the constraint
Diffstat (limited to 'lib/asn1/src/asn1ct_imm.erl')
-rw-r--r--lib/asn1/src/asn1ct_imm.erl6
1 files changed, 4 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),