PER: Correct compilation of named INTEGERs

When a constrained INTEGER has more than 16536 values and named
values, the compiler would crash when compiling to the PER
format. Example:

  Longitude ::= INTEGER {
        oneMicrodegreeEast(10),
        oneMicrodegreeWest(-10),
        unavailable(1800000001)
  } (-1799999999..1800000001)

Reported-by: Ingars

3 files changed, 54 insertions, 15 deletions

diff --git a/lib/asn1/src/asn1ct_imm.erl b/lib/asn1/src/asn1ct_imm.erl
index 527f4f0ba9..e09256cde9 100644
--- a/lib/asn1/src/asn1ct_imm.erl
+++ b/lib/asn1/src/asn1ct_imm.erl
@@ -1120,38 +1120,41 @@ per_enc_constrained(Val0, Lb, Ub, false) ->
 per_enc_constrained(Val0, Lb, Ub, true) ->
     {Prefix,Val} = sub_lb(Val0, Lb),
     Range = Ub - Lb + 1,
+    Check = {ult,Val,Range},
     if
 	Range < 256 ->
 	    NumBits = per_num_bits(Range),
-	    Check = {ult,Val,Range},
 	    Put = [{put_bits,Val,NumBits,[1]}],
 	    {Prefix,Check,Put};
 	Range =:= 256 ->
 	    NumBits = 8,
-	    Check = {ult,Val,Range},
 	    Put = [{put_bits,Val,NumBits,[1,align]}],
 	    {Prefix,Check,Put};
 	Range =< 65536 ->
-	    Check = {ult,Val,Range},
 	    Put = [{put_bits,Val,16,[1,align]}],
 	    {Prefix,Check,Put};
 	true ->
-	    {var,VarBase} = Val,
-	    Bin = {var,VarBase++"@bin"},
-	    BinSize0 = {var,VarBase++"@bin_size0"},
-	    BinSize = {var,VarBase++"@bin_size"},
-	    Check = {ult,Val,Range},
 	    RangeOctsLen = byte_size(binary:encode_unsigned(Range - 1)),
 	    BitsNeeded = per_num_bits(RangeOctsLen),
-	    Enc = [{call,binary,encode_unsigned,[Val],Bin},
-		   {call,erlang,byte_size,[Bin],BinSize0},
-		   {sub,BinSize0,1,BinSize},
-		   {'cond',[['_',
-			     {put_bits,BinSize,BitsNeeded,[1]},
-			     {put_bits,Bin,binary,[8,align]}]]}],
-	    {Prefix,Check,Enc}
+	    {Prefix,Check,per_enc_constrained_huge(BitsNeeded, Val)}
     end.
 
+per_enc_constrained_huge(BitsNeeded, {var,VarBase}=Val) ->
+    Bin = {var,VarBase++"@bin"},
+    BinSize0 = {var,VarBase++"@bin_size0"},
+    BinSize = {var,VarBase++"@bin_size"},
+    [{call,binary,encode_unsigned,[Val],Bin},
+     {call,erlang,byte_size,[Bin],BinSize0},
+     {sub,BinSize0,1,BinSize},
+     {'cond',[['_',
+	       {put_bits,BinSize,BitsNeeded,[1]},
+	       {put_bits,Bin,binary,[8,align]}]]}];
+per_enc_constrained_huge(BitsNeeded, Val) when is_integer(Val) ->
+    Bin = binary:encode_unsigned(Val),
+    BinSize = erlang:byte_size(Bin),
+    [{put_bits,BinSize-1,BitsNeeded,[1]},
+     {put_bits,Val,8*BinSize,[1,align]}].
+
 per_enc_unconstrained(Val, Aligned) ->
     case Aligned of
 	false -> [];
diff --git a/lib/asn1/test/asn1_SUITE_data/Prim.asn1 b/lib/asn1/test/asn1_SUITE_data/Prim.asn1
index b4c011fd39..4fe0901683 100644
--- a/lib/asn1/test/asn1_SUITE_data/Prim.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/Prim.asn1
@@ -60,4 +60,11 @@ BEGIN
     e BOOLEAN,
     magic INTEGER
   }
+
+  Longitude ::= INTEGER {
+        oneMicrodegreeEast(10),
+        oneMicrodegreeWest(-10),
+        unavailable(1800000001)
+  } (-1799999999..1800000001)
+
 END
diff --git a/lib/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl
index 8fa9973ea5..dc2e0fa2e7 100644
--- a/lib/asn1/test/testPrim.erl
+++ b/lib/asn1/test/testPrim.erl
@@ -78,8 +78,37 @@ int(Rules) ->
     roundtrip('ASeq', {'ASeq',false,250,true,200,true,199,true,77788}),
     roundtrip('ASeq', {'ASeq',true,0,false,0,true,0,true,68789}),
 
+    %%==========================================================
+    %% Longitude ::= INTEGER {
+    %%  oneMicrodegreeEast(10),
+    %%  oneMicrodegreeWest(-10),
+    %%  unavailable(1800000001)
+    %% } (-1799999999..1800000001)
+    %%==========================================================
+
+    Enc10 = encoding(Rules, oneMicrodegreeEast),
+    Enc10 = roundtrip('Longitude', oneMicrodegreeEast),
+    Enc10 = roundtrip('Longitude', 10, oneMicrodegreeEast),
+
+    Enc20 = encoding(Rules, oneMicrodegreeWest),
+    Enc20 = roundtrip('Longitude', oneMicrodegreeWest),
+    Enc20 = roundtrip('Longitude', -10, oneMicrodegreeWest),
+
+    Enc30 = roundtrip('Longitude', unavailable),
+    Enc30 = roundtrip('Longitude', 1800000001, unavailable),
+
     ok.
 
+encoding(Rules, Type) ->
+    asn1_test_lib:hex_to_bin(encoding_1(Rules, Type)).
+
+encoding_1(ber, oneMicrodegreeEast) -> "02010A";
+encoding_1(per, oneMicrodegreeEast) -> "C06B49D2 09";
+encoding_1(uper, oneMicrodegreeEast) -> "6B49D209";
+
+encoding_1(ber, oneMicrodegreeWest) -> "0201F6";
+encoding_1(per, oneMicrodegreeWest) -> "C06B49D1 F5";
+encoding_1(uper, oneMicrodegreeWest) -> "6B49D1F5".
 
 enum(Rules) ->