From 69f02872020636d3efbbecf4bd3de7196040f6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 27 May 2013 13:41:42 +0200
Subject: PER, UPER: Fix record name mismatch between HRL file and decoding
 code

When a SEQUENCE was defined inline inside extension addition group
like this:

InlinedSeq ::= SEQUENCE {
     ...,
     [[
        s SEQUENCE {
	   a INTEGER,
	   b BOOLEAN
        }
     ]]
}

the decoding code would return the contents of the SEQUENCE in a
record named 'InlinedSeq_ExtAddGroup1_s', while the record definition
in the generated HRL file would be 'InlinedSeq_s'.

Since there is no reason to use the longer record name (no risk for
ambiguity), correct the name in the decoding code.
---
 lib/asn1/src/asn1ct_constructed_per.erl            | 26 ++++++++++++++++++++--
 .../asn1_SUITE_data/Extension-Addition-Group.asn   | 19 ++++++++++++++++
 .../asn1_SUITE_data/extensionAdditionGroup.erl     |  3 +++
 3 files changed, 46 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index efb55cf015..d279e9697f 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -354,8 +354,7 @@ gen_dec_constructed_imm_2(Typename, CompList,
     %% we don't return named lists any more   Cnames = mkcnamelist(CompList), 
     demit({"Result = "}), %dbg
     %% return value as record
-    RecordName = lists:concat([get_record_name_prefix(),
-			       asn1ct_gen:list2rname(Typename)]),
+    RecordName = record_name(Typename),
     case Typename of
 	['EXTERNAL'] ->
 	    emit({"   OldFormat={'",RecordName,
@@ -377,6 +376,29 @@ gen_dec_constructed_imm_2(Typename, CompList,
     end,
     emit({{curr,bytes},"}"}).
 
+%% record_name([TypeName]) -> RecordNameString
+%%  Construct a record name for the constructed type, ignoring any
+%%  fake sequences that are used to represent an extension addition
+%%  group. Such fake sequences never appear as a top type, and their
+%%  name always start with "ExtAddGroup".
+
+record_name(Typename0) ->
+    [TopType|Typename1] = lists:reverse(Typename0),
+    Typename = filter_ext_add_groups(Typename1, [TopType]),
+    lists:concat([get_record_name_prefix(),
+		  asn1ct_gen:list2rname(Typename)]).
+
+filter_ext_add_groups([H|T], Acc) when is_atom(H) ->
+    case atom_to_list(H) of
+	"ExtAddGroup"++_ ->
+	    filter_ext_add_groups(T, Acc);
+	_ ->
+	    filter_ext_add_groups(T, [H|Acc])
+    end;
+filter_ext_add_groups([H|T], Acc) ->
+    filter_ext_add_groups(T, [H|Acc]);
+filter_ext_add_groups([], Acc) -> Acc.
+
 textual_order([#'ComponentType'{textual_order=undefined}|_],TermList) ->
     TermList;
 textual_order(CompList,TermList) when is_list(CompList) ->
diff --git a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
index b07dcd8baa..0e905d8839 100644
--- a/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
+++ b/lib/asn1/test/asn1_SUITE_data/Extension-Addition-Group.asn
@@ -118,4 +118,23 @@ AC-BarringConfig ::= SEQUENCE {
   ac-BarringForSpecialAC BIT STRING (SIZE(5))
 }
 
+InlinedSeq ::= SEQUENCE {
+     ...,
+     [[
+        s SEQUENCE {
+	   a INTEGER,
+	   b BOOLEAN
+        }
+     ]]
+}
+
+-- 'ExtAddGroup1' is used internally to represent fake sequences for
+-- extension addition groups. Make sure that a real sequence with that
+-- name at the top-level doesn't cause a problem.
+
+ExtAddGroup1 ::= SEQUENCE {
+    x INTEGER,
+    y INTEGER
+}
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
index 00e4c707dd..8e21e6ca84 100644
--- a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -34,6 +34,9 @@ run(Erule) ->
     run3(),
     run3(Erule),
 
+    roundtrip('InlinedSeq', #'InlinedSeq'{s=#'InlinedSeq_s'{a=42,b=true}}),
+    roundtrip('ExtAddGroup1', #'ExtAddGroup1'{x=42,y=1023}),
+
     ok.
 
 %% From X.691 (07/2002) A.4.
-- 
cgit v1.2.3