aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-08-22 14:31:39 +0200
committerBjörn Gustavsson <[email protected]>2014-09-01 14:37:15 +0200
commitf2491c28caea8244eab619321bc95832257bf146 (patch)
tree677737b2e260c86691edcef4a6e4a08884299b76 /lib/asn1/src
parentdb3f8d752054d69285c318e39adb45cf4c85a3e7 (diff)
downloadotp-f2491c28caea8244eab619321bc95832257bf146.tar.gz
otp-f2491c28caea8244eab619321bc95832257bf146.tar.bz2
otp-f2491c28caea8244eab619321bc95832257bf146.zip
Workaround for combining two object sets separated by extension
The following type of code would crash the compiler: OSET SOME-CLASS ::= {OSET1, ..., OSET2}
Diffstat (limited to 'lib/asn1/src')
-rw-r--r--lib/asn1/src/asn1ct_check.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 76a74aa477..5d8740b92e 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -947,6 +947,8 @@ prepare_objset(ObjDef={object,definedsyntax,_ObjFields}) ->
{set,[ObjDef],false};
prepare_objset({ObjDef=#type{},Ext}) when is_list(Ext) ->
{set,[ObjDef|Ext],true};
+prepare_objset({#type{}=Type,#type{}=Ext}) ->
+ {set,[Type,Ext],true};
prepare_objset(Ret) ->
Ret.