PER/UPER: Correct decoding of SEQUENCEs with more than 64 extensions

4 files changed, 250 insertions, 5 deletions

diff --git a/lib/asn1/src/asn1ct_imm.erl b/lib/asn1/src/asn1ct_imm.erl
index c6803a0f96..bf362db843 100644
--- a/lib/asn1/src/asn1ct_imm.erl
+++ b/lib/asn1/src/asn1ct_imm.erl
@@ -86,7 +86,7 @@ per_dec_enumerated(BaseNamedList, NamedListExt0, Aligned) ->
     bit_case(Base, Ext).
 
 per_dec_extension_map(Aligned) ->
-    Len = {add,per_dec_normally_small_number(Aligned),1},
+    Len = per_dec_normally_small_length(Aligned),
     {get_bits,Len,[1,bitstring]}.
 
 per_dec_integer(Constraint0, Aligned) ->
@@ -240,6 +240,11 @@ per_dec_normally_small_number(Aligned) ->
     Unlimited = per_decode_semi_constrained(0, Aligned),
     bit_case(Small, Unlimited).
 
+per_dec_normally_small_length(Aligned) ->
+    Small = {add,{get_bits,6,[1]},1},
+    Unlimited = decode_unconstrained_length(false, Aligned),
+    bit_case(Small, Unlimited).
+
 per_decode_semi_constrained(Lb, Aligned) ->
     add_lb(Lb, {get_bits,decode_unconstrained_length(false, Aligned),[8]}).
 
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 6be493320c..f00b23a8b2 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -454,10 +454,13 @@ testSeqDefault(Config, Rule, Opts) ->
 
 testSeqExtension(Config) -> test(Config, fun testSeqExtension/3).
 testSeqExtension(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SeqExtension"], Config,
+    asn1_test_lib:compile_all(["External",
+			       "SeqExtension",
+			       "SeqExtension2"],
+			      Config,
                               [Rule|Opts]),
     DataDir = ?config(data_dir, Config),
-    testSeqExtension:main(DataDir, [Rule|Opts]).
+    testSeqExtension:main(Rule, DataDir, [Rule|Opts]).
 
 testSeqExternal(Config) -> test(Config, fun testSeqExternal/3).
 testSeqExternal(Config, Rule, Opts) ->
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqExtension2.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqExtension2.asn1
new file mode 100644
index 0000000000..44900d9d39
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/SeqExtension2.asn1
@@ -0,0 +1,208 @@
+SeqExtension2 DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+SeqExt66 ::= SEQUENCE {
+  ...,
+  i0 INTEGER (0..127) OPTIONAL,
+  i1 INTEGER (0..127) OPTIONAL,
+  i2 INTEGER (0..127) OPTIONAL,
+  i3 INTEGER (0..127) OPTIONAL,
+  i4 INTEGER (0..127) OPTIONAL,
+  i5 INTEGER (0..127) OPTIONAL,
+  i6 INTEGER (0..127) OPTIONAL,
+  i7 INTEGER (0..127) OPTIONAL,
+  i8 INTEGER (0..127) OPTIONAL,
+  i9 INTEGER (0..127) OPTIONAL,
+  i10 INTEGER (0..127) OPTIONAL,
+  i11 INTEGER (0..127) OPTIONAL,
+  i12 INTEGER (0..127) OPTIONAL,
+  i13 INTEGER (0..127) OPTIONAL,
+  i14 INTEGER (0..127) OPTIONAL,
+  i15 INTEGER (0..127) OPTIONAL,
+  i16 INTEGER (0..127) OPTIONAL,
+  i17 INTEGER (0..127) OPTIONAL,
+  i18 INTEGER (0..127) OPTIONAL,
+  i19 INTEGER (0..127) OPTIONAL,
+  i20 INTEGER (0..127) OPTIONAL,
+  i21 INTEGER (0..127) OPTIONAL,
+  i22 INTEGER (0..127) OPTIONAL,
+  i23 INTEGER (0..127) OPTIONAL,
+  i24 INTEGER (0..127) OPTIONAL,
+  i25 INTEGER (0..127) OPTIONAL,
+  i26 INTEGER (0..127) OPTIONAL,
+  i27 INTEGER (0..127) OPTIONAL,
+  i28 INTEGER (0..127) OPTIONAL,
+  i29 INTEGER (0..127) OPTIONAL,
+  i30 INTEGER (0..127) OPTIONAL,
+  i31 INTEGER (0..127) OPTIONAL,
+  i32 INTEGER (0..127) OPTIONAL,
+  i33 INTEGER (0..127) OPTIONAL,
+  i34 INTEGER (0..127) OPTIONAL,
+  i35 INTEGER (0..127) OPTIONAL,
+  i36 INTEGER (0..127) OPTIONAL,
+  i37 INTEGER (0..127) OPTIONAL,
+  i38 INTEGER (0..127) OPTIONAL,
+  i39 INTEGER (0..127) OPTIONAL,
+  i40 INTEGER (0..127) OPTIONAL,
+  i41 INTEGER (0..127) OPTIONAL,
+  i42 INTEGER (0..127) OPTIONAL,
+  i43 INTEGER (0..127) OPTIONAL,
+  i44 INTEGER (0..127) OPTIONAL,
+  i45 INTEGER (0..127) OPTIONAL,
+  i46 INTEGER (0..127) OPTIONAL,
+  i47 INTEGER (0..127) OPTIONAL,
+  i48 INTEGER (0..127) OPTIONAL,
+  i49 INTEGER (0..127) OPTIONAL,
+  i50 INTEGER (0..127) OPTIONAL,
+  i51 INTEGER (0..127) OPTIONAL,
+  i52 INTEGER (0..127) OPTIONAL,
+  i53 INTEGER (0..127) OPTIONAL,
+  i54 INTEGER (0..127) OPTIONAL,
+  i55 INTEGER (0..127) OPTIONAL,
+  i56 INTEGER (0..127) OPTIONAL,
+  i57 INTEGER (0..127) OPTIONAL,
+  i58 INTEGER (0..127) OPTIONAL,
+  i59 INTEGER (0..127) OPTIONAL,
+  i60 INTEGER (0..127) OPTIONAL,
+  i61 INTEGER (0..127) OPTIONAL,
+  i62 INTEGER (0..127) OPTIONAL,
+  i63 INTEGER (0..127) OPTIONAL,
+  i64 INTEGER (0..127) OPTIONAL,
+  i65 INTEGER (0..127) OPTIONAL
+}
+
+SeqExt130 ::= SEQUENCE {
+  ...,
+  i0 INTEGER (0..255) OPTIONAL,
+  i1 INTEGER (0..255) OPTIONAL,
+  i2 INTEGER (0..255) OPTIONAL,
+  i3 INTEGER (0..255) OPTIONAL,
+  i4 INTEGER (0..255) OPTIONAL,
+  i5 INTEGER (0..255) OPTIONAL,
+  i6 INTEGER (0..255) OPTIONAL,
+  i7 INTEGER (0..255) OPTIONAL,
+  i8 INTEGER (0..255) OPTIONAL,
+  i9 INTEGER (0..255) OPTIONAL,
+  i10 INTEGER (0..255) OPTIONAL,
+  i11 INTEGER (0..255) OPTIONAL,
+  i12 INTEGER (0..255) OPTIONAL,
+  i13 INTEGER (0..255) OPTIONAL,
+  i14 INTEGER (0..255) OPTIONAL,
+  i15 INTEGER (0..255) OPTIONAL,
+  i16 INTEGER (0..255) OPTIONAL,
+  i17 INTEGER (0..255) OPTIONAL,
+  i18 INTEGER (0..255) OPTIONAL,
+  i19 INTEGER (0..255) OPTIONAL,
+  i20 INTEGER (0..255) OPTIONAL,
+  i21 INTEGER (0..255) OPTIONAL,
+  i22 INTEGER (0..255) OPTIONAL,
+  i23 INTEGER (0..255) OPTIONAL,
+  i24 INTEGER (0..255) OPTIONAL,
+  i25 INTEGER (0..255) OPTIONAL,
+  i26 INTEGER (0..255) OPTIONAL,
+  i27 INTEGER (0..255) OPTIONAL,
+  i28 INTEGER (0..255) OPTIONAL,
+  i29 INTEGER (0..255) OPTIONAL,
+  i30 INTEGER (0..255) OPTIONAL,
+  i31 INTEGER (0..255) OPTIONAL,
+  i32 INTEGER (0..255) OPTIONAL,
+  i33 INTEGER (0..255) OPTIONAL,
+  i34 INTEGER (0..255) OPTIONAL,
+  i35 INTEGER (0..255) OPTIONAL,
+  i36 INTEGER (0..255) OPTIONAL,
+  i37 INTEGER (0..255) OPTIONAL,
+  i38 INTEGER (0..255) OPTIONAL,
+  i39 INTEGER (0..255) OPTIONAL,
+  i40 INTEGER (0..255) OPTIONAL,
+  i41 INTEGER (0..255) OPTIONAL,
+  i42 INTEGER (0..255) OPTIONAL,
+  i43 INTEGER (0..255) OPTIONAL,
+  i44 INTEGER (0..255) OPTIONAL,
+  i45 INTEGER (0..255) OPTIONAL,
+  i46 INTEGER (0..255) OPTIONAL,
+  i47 INTEGER (0..255) OPTIONAL,
+  i48 INTEGER (0..255) OPTIONAL,
+  i49 INTEGER (0..255) OPTIONAL,
+  i50 INTEGER (0..255) OPTIONAL,
+  i51 INTEGER (0..255) OPTIONAL,
+  i52 INTEGER (0..255) OPTIONAL,
+  i53 INTEGER (0..255) OPTIONAL,
+  i54 INTEGER (0..255) OPTIONAL,
+  i55 INTEGER (0..255) OPTIONAL,
+  i56 INTEGER (0..255) OPTIONAL,
+  i57 INTEGER (0..255) OPTIONAL,
+  i58 INTEGER (0..255) OPTIONAL,
+  i59 INTEGER (0..255) OPTIONAL,
+  i60 INTEGER (0..255) OPTIONAL,
+  i61 INTEGER (0..255) OPTIONAL,
+  i62 INTEGER (0..255) OPTIONAL,
+  i63 INTEGER (0..255) OPTIONAL,
+  i64 INTEGER (0..255) OPTIONAL,
+  i65 INTEGER (0..255) OPTIONAL,
+  i66 INTEGER (0..255) OPTIONAL,
+  i67 INTEGER (0..255) OPTIONAL,
+  i68 INTEGER (0..255) OPTIONAL,
+  i69 INTEGER (0..255) OPTIONAL,
+  i70 INTEGER (0..255) OPTIONAL,
+  i71 INTEGER (0..255) OPTIONAL,
+  i72 INTEGER (0..255) OPTIONAL,
+  i73 INTEGER (0..255) OPTIONAL,
+  i74 INTEGER (0..255) OPTIONAL,
+  i75 INTEGER (0..255) OPTIONAL,
+  i76 INTEGER (0..255) OPTIONAL,
+  i77 INTEGER (0..255) OPTIONAL,
+  i78 INTEGER (0..255) OPTIONAL,
+  i79 INTEGER (0..255) OPTIONAL,
+  i80 INTEGER (0..255) OPTIONAL,
+  i81 INTEGER (0..255) OPTIONAL,
+  i82 INTEGER (0..255) OPTIONAL,
+  i83 INTEGER (0..255) OPTIONAL,
+  i84 INTEGER (0..255) OPTIONAL,
+  i85 INTEGER (0..255) OPTIONAL,
+  i86 INTEGER (0..255) OPTIONAL,
+  i87 INTEGER (0..255) OPTIONAL,
+  i88 INTEGER (0..255) OPTIONAL,
+  i89 INTEGER (0..255) OPTIONAL,
+  i90 INTEGER (0..255) OPTIONAL,
+  i91 INTEGER (0..255) OPTIONAL,
+  i92 INTEGER (0..255) OPTIONAL,
+  i93 INTEGER (0..255) OPTIONAL,
+  i94 INTEGER (0..255) OPTIONAL,
+  i95 INTEGER (0..255) OPTIONAL,
+  i96 INTEGER (0..255) OPTIONAL,
+  i97 INTEGER (0..255) OPTIONAL,
+  i98 INTEGER (0..255) OPTIONAL,
+  i99 INTEGER (0..255) OPTIONAL,
+  i100 INTEGER (0..255) OPTIONAL,
+  i101 INTEGER (0..255) OPTIONAL,
+  i102 INTEGER (0..255) OPTIONAL,
+  i103 INTEGER (0..255) OPTIONAL,
+  i104 INTEGER (0..255) OPTIONAL,
+  i105 INTEGER (0..255) OPTIONAL,
+  i106 INTEGER (0..255) OPTIONAL,
+  i107 INTEGER (0..255) OPTIONAL,
+  i108 INTEGER (0..255) OPTIONAL,
+  i109 INTEGER (0..255) OPTIONAL,
+  i110 INTEGER (0..255) OPTIONAL,
+  i111 INTEGER (0..255) OPTIONAL,
+  i112 INTEGER (0..255) OPTIONAL,
+  i113 INTEGER (0..255) OPTIONAL,
+  i114 INTEGER (0..255) OPTIONAL,
+  i115 INTEGER (0..255) OPTIONAL,
+  i116 INTEGER (0..255) OPTIONAL,
+  i117 INTEGER (0..255) OPTIONAL,
+  i118 INTEGER (0..255) OPTIONAL,
+  i119 INTEGER (0..255) OPTIONAL,
+  i120 INTEGER (0..255) OPTIONAL,
+  i121 INTEGER (0..255) OPTIONAL,
+  i122 INTEGER (0..255) OPTIONAL,
+  i123 INTEGER (0..255) OPTIONAL,
+  i124 INTEGER (0..255) OPTIONAL,
+  i125 INTEGER (0..255) OPTIONAL,
+  i126 INTEGER (0..255) OPTIONAL,
+  i127 INTEGER (0..255) OPTIONAL,
+  i128 INTEGER (0..255) OPTIONAL,
+  i129 INTEGER (0..255) OPTIONAL
+}
+
+END
diff --git a/lib/asn1/test/testSeqExtension.erl b/lib/asn1/test/testSeqExtension.erl
index 1128d9a7c3..724f485fa0 100644
--- a/lib/asn1/test/testSeqExtension.erl
+++ b/lib/asn1/test/testSeqExtension.erl
@@ -20,7 +20,7 @@
 -module(testSeqExtension).
 
 -include("External.hrl").
--export([main/2]).
+-export([main/3]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -32,7 +32,7 @@
 -record('SeqExt6',{i1,i2,i3,i4,i5,i6,i7}).
 -record('SuperSeq',{s1,s2,s3,s4,s5,s6,i}).
 
-main(DataDir, Opts) ->
+main(Erule, DataDir, Opts) ->
     roundtrip('SeqExt1', #'SeqExt1'{}),
 
     roundtrip('SeqExt2', #'SeqExt2'{bool=true,int=99}),
@@ -92,9 +92,38 @@ main(DataDir, Opts) ->
 		s5={'SeqExt5'},
 		s6={'SeqExt6',531,601,999,777,11953},
 		i=BigInt} = DecodedSuperSeq,
+
+
+    %% Test more than 64 extensions.
+    roundtrip2('SeqExt66',
+	       list_to_tuple(['SeqExt66'|lists:seq(0, 65)])),
+    v_roundtrip2(Erule, 'SeqExt66',
+		 list_to_tuple(['SeqExt66'|
+				lists:duplicate(65, asn1_NOVALUE)++[125]])),
+    roundtrip2('SeqExt130',
+	       list_to_tuple(['SeqExt130'|lists:seq(0, 129)])),
+    v_roundtrip2(Erule, 'SeqExt130',
+		 list_to_tuple(['SeqExt130'|
+				lists:duplicate(129, asn1_NOVALUE)++[199]])),
     ok.
 
 roundtrip(Type, Value) ->
     {ok,Encoded} = 'SeqExtension':encode(Type, Value),
     {ok,Value} = 'SeqExtension':decode(Type, Encoded),
     ok.
+
+v_roundtrip2(Erule, Type, Value) ->
+    Encoded = asn1_test_lib:hex_to_bin(v(Erule, Type)),
+    Encoded = roundtrip2(Type, Value).
+
+roundtrip2(Type, Value) ->
+    {ok,Encoded} = 'SeqExtension2':encode(Type, Value),
+    {ok,Value} = 'SeqExtension2':decode(Type, Encoded),
+    Encoded.
+
+v(ber, 'SeqExt66') ->  "30049F41 017D";
+v(per, 'SeqExt66') ->  "C0420000 00000000 00004001 FA";
+v(uper, 'SeqExt66') -> "D0800000 00000000 00101FA0";
+v(ber, 'SeqExt130') ->  "30069F81 010200C7";
+v(per, 'SeqExt130') ->  "C0808200 00000000 00000000 00000000 00000040 01C7";
+v(uper, 'SeqExt130') -> "E0208000 00000000 00000000 00000000 0000101C 70".