Fix a bug in skipping of extensions

Extensions following a double bracket group were not skipped correctly.
Fix this bug and add tests to ensure that extensions are skipped
correctly.

4 files changed, 85 insertions, 5 deletions

diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index b29a7b3048..4ec34da019 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -1099,10 +1099,11 @@ gen_dec_components_call(Erule,TopType,CL={Root1,ExtList,Root2},
     {EmitExts,_} = gen_dec_comp_calls(NewExtList, Erule, TopType, OptTable,
 				      DecInfObj, Ext, NumberOfOptionals,
 				      Tpos, []),
+    NumExtsToSkip = ext_length(ExtList),
     Finish =
 	fun(St) ->
 		emit([{next,bytes},"= ?RT_PER:skipextensions(",{curr,bytes},",",
-		      length(ExtList)+1,",Extensions)"]),
+		      NumExtsToSkip+1,",Extensions)"]),
 		asn1ct_name:new(bytes),
 		St
 	end,
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index cc96951fd3..f8ef1ac19a 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -429,7 +429,8 @@ testSeqExtension(Config) -> test(Config, fun testSeqExtension/3).
 testSeqExtension(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["External", "SeqExtension"], Config,
                               [Rule|Opts]),
-    testSeqExtension:main(Rule).
+    DataDir = ?config(data_dir, Config),
+    testSeqExtension:main(DataDir, [Rule|Opts]).
 
 testSeqExternal(Config) -> test(Config, fun testSeqExternal/3).
 testSeqExternal(Config, Rule, Opts) ->
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
index bb0a7cca3a..5fda19303a 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SeqExtension.asn1
@@ -31,7 +31,35 @@ SeqExt4 ::= SEQUENCE
   int  INTEGER
 }
 
+SeqExt5 ::= SEQUENCE
+{
+  ...,
+  [[ name OCTET STRING (SIZE (1..8)),
+     shoesize INTEGER ]]
+}
+
+SeqExt6 ::= SEQUENCE
+{
+  -- The spaces between the ellipsis and the comma will prevent them
+  -- from being removed.
+  ...     ,
+  [[ i1 [100] INTEGER, i2 [101] INTEGER, i3 [102] INTEGER ]],
+  [[ i4 [104] INTEGER, i5 [105] INTEGER ]],
+  [[ i6 [106] INTEGER, i7 [107] INTEGER ]]
+}
+
 SeqExt1X ::= XSeqExt1 
 SeqExt2X ::= XSeqExt2 
 
+SuperSeq ::= SEQUENCE
+{
+  s1 SeqExt1,
+  s2 SeqExt2,
+  s3 SeqExt3,
+  s4 SeqExt4,
+  s5 SeqExt5,
+  s6 SeqExt6,
+  i INTEGER
+}
+
 END
diff --git a/lib/asn1/test/testSeqExtension.erl b/lib/asn1/test/testSeqExtension.erl
index 45214b0a9b..1128d9a7c3 100644
--- a/lib/asn1/test/testSeqExtension.erl
+++ b/lib/asn1/test/testSeqExtension.erl
@@ -20,7 +20,7 @@
 -module(testSeqExtension).
 
 -include("External.hrl").
--export([main/1]).
+-export([main/2]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -28,9 +28,11 @@
 -record('SeqExt2',{bool, int}).
 -record('SeqExt3',{bool, int}).
 -record('SeqExt4',{bool, int}).
+-record('SeqExt5',{name, shoesize}).
+-record('SeqExt6',{i1,i2,i3,i4,i5,i6,i7}).
+-record('SuperSeq',{s1,s2,s3,s4,s5,s6,i}).
 
-
-main(_Rules) ->
+main(DataDir, Opts) ->
     roundtrip('SeqExt1', #'SeqExt1'{}),
 
     roundtrip('SeqExt2', #'SeqExt2'{bool=true,int=99}),
@@ -42,6 +44,54 @@ main(_Rules) ->
     roundtrip('SeqExt4', #'SeqExt4'{bool=true,int=12345}),
     roundtrip('SeqExt4', #'SeqExt4'{bool=false,int=123456}),
 
+    roundtrip('SeqExt5', #'SeqExt5'{name="Arne",shoesize=47}),
+
+    %% Encode a value with this version of the specification.
+    BigInt = 128638468966,
+    SuperSeq = #'SuperSeq'{s1=#'SeqExt1'{},
+			   s2=#'SeqExt2'{bool=true,int=2345},
+			   s3=#'SeqExt3'{bool=false,int=17},
+			   s4=#'SeqExt4'{bool=true,int=38739739},
+			   s5=#'SeqExt5'{name="Arne",shoesize=47},
+			   s6=#'SeqExt6'{i1=531,i2=601,i3=999,
+					 i4=777,i5=11953,
+					 i6=13553,i7=77777},
+			   i=BigInt
+			  },
+    {ok,SuperSeqEnc} = 'SeqExtension':encode('SuperSeq', SuperSeq),
+    {ok,SuperSeq} = 'SeqExtension':decode('SuperSeq', SuperSeqEnc),
+
+    %% Remove all extensions from the ASN.1 specification and compile it.
+    CaseDir = filename:dirname(code:which('SeqExtension')),
+    Asn1SrcBase = "SeqExtension.asn1",
+    Asn1SrcFile0 = filename:join(DataDir, Asn1SrcBase),
+    {ok,Src0} = file:read_file(Asn1SrcFile0),
+    %% Remove all declarations following "...," up to the end
+    %% of the SEQUENCE.
+    Src1 = re:replace(Src0, "[.][.][.],[^}]*", "...\n",
+		      [global,{return,binary}]),
+    %% Remove the last double bracket group in the SEQUENCE.
+    Src = re:replace(Src1, ",\\s*\\[\\[.*?\\]\\]\\s*\\}", "\n}",
+		     [global,{return,binary}]),
+    io:format("~s\n\n", [Src]),
+    Asn1SrcFile = filename:join(CaseDir, Asn1SrcBase),
+    ok = file:write_file(Asn1SrcFile, Src),
+    ok = asn1ct:compile(Asn1SrcFile,
+			[{i,DataDir},{outdir,CaseDir}|Opts]),
+
+    %% Decode the encoded sequence with the version of the spec
+    %% with no extensions following the extension marks
+    %% (except in SeqExt6). The integer 'i' at the end
+    %% of the sequence must still be the correct integer (otherwise
+    %% some extension has not been skipped correctly).
+    {ok,DecodedSuperSeq} = 'SeqExtension':decode('SuperSeq', SuperSeqEnc),
+    #'SuperSeq'{s1={'SeqExt1'},
+		s2=#'SeqExt2'{bool=true,int=2345},
+		s3={'SeqExt3'},
+		s4={'SeqExt4',true},
+		s5={'SeqExt5'},
+		s6={'SeqExt6',531,601,999,777,11953},
+		i=BigInt} = DecodedSuperSeq,
     ok.
 
 roundtrip(Type, Value) ->