diff options
| author | Björn Gustavsson <[email protected]> | 2013-04-02 13:39:50 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-04-03 16:38:31 +0200 |
| commit | f7c7510b55efe6a1ab1133f47ec4c3b0371784e8 (patch) | |
| tree | 76c89f1eeb6044f6b9c949f8295f5a6170c7e779 /lib/asn1/src/asn1ct_check.erl | |
| parent | 45e356fb7b5d381a6e3c9ec83bf20fe9cefe8e4b (diff) | |
| download | otp-f7c7510b55efe6a1ab1133f47ec4c3b0371784e8.tar.gz otp-f7c7510b55efe6a1ab1133f47ec4c3b0371784e8.tar.bz2 otp-f7c7510b55efe6a1ab1133f47ec4c3b0371784e8.zip | |
Prevent loss of objects after the extension marker
In an object set with a single root object, objects after
the extension marker would be lost.
Diffstat (limited to 'lib/asn1/src/asn1ct_check.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_check.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl index 2b48c62ac9..99b09c4e90 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) -> |