aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/src/asn1ct_check.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2013-04-16 20:14:58 +0200
committerErlang/OTP <[email protected]>2013-04-16 20:14:58 +0200
commit53a6a6e5741627b2af2c9fbe631d0da7146606cd (patch)
tree5bea54d2fc9dc17de04413362ba9ccbf0e004fdb /lib/asn1/src/asn1ct_check.erl
parent7b31cdb80624567568474d79bff07e053457a450 (diff)
parentf7c7510b55efe6a1ab1133f47ec4c3b0371784e8 (diff)
downloadotp-53a6a6e5741627b2af2c9fbe631d0da7146606cd.tar.gz
otp-53a6a6e5741627b2af2c9fbe631d0da7146606cd.tar.bz2
otp-53a6a6e5741627b2af2c9fbe631d0da7146606cd.zip
Merge branch 'bjorn/asn1/fix-lost-extension-mark/OTP-10995' into maint-r16
* bjorn/asn1/fix-lost-extension-mark/OTP-10995: Prevent loss of objects after the extension marker Don't lose the extension mark for object set parameters
Diffstat (limited to 'lib/asn1/src/asn1ct_check.erl')
-rw-r--r--lib/asn1/src/asn1ct_check.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index e1911d8170..0622998445 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -1025,8 +1025,8 @@ prepare_objset({{'SingleValue',Set},Ext}) ->
%% {set,lists:append([Set,Ext]),true};
prepare_objset({Set,Ext}) when is_list(Set) ->
{set,merge_sets(Set,Ext),true};
-prepare_objset({ObjDef={object,definedsyntax,_ObjFields},_Ext}) ->
- {set,[ObjDef],true};
+prepare_objset({{object,definedsyntax,_ObjFields}=Set,Ext}) ->
+ {set,merge_sets(Set, Ext),true};
prepare_objset(ObjDef={object,definedsyntax,_ObjFields}) ->
{set,[ObjDef],false};
prepare_objset({ObjDef=#type{},Ext}) when is_list(Ext) ->
@@ -4034,8 +4034,8 @@ categorize(S,value,Type,Value) ->
[#valuedef{type=Type,value=Value,module=S#state.mname}].
-parse_objectset({valueset,T=#type{}}) ->
- [T];
+parse_objectset({valueset,#type{def=#'Externaltypereference'{}=Ref}}) ->
+ Ref;
parse_objectset({valueset,Set}) ->
Set;
parse_objectset(#type{def=Ref}) when is_record(Ref,'Externaltypereference') ->