diff options
author | Kenneth Lundin <[email protected]> | 2011-03-04 12:38:24 +0100 |
---|---|---|
committer | Kenneth Lundin <[email protected]> | 2011-03-07 16:09:39 +0100 |
commit | 8ba3b32de9548ddfc4194d2e7825d6c78bcb37ec (patch) | |
tree | 4a17c4349ac9ca77b964828b8d7f4ddcaf937b46 /lib/asn1/src/asn1ct_check.erl | |
parent | 4c7786f58f8f101723b00e839baa068f8cf34579 (diff) | |
download | otp-8ba3b32de9548ddfc4194d2e7825d6c78bcb37ec.tar.gz otp-8ba3b32de9548ddfc4194d2e7825d6c78bcb37ec.tar.bz2 otp-8ba3b32de9548ddfc4194d2e7825d6c78bcb37ec.zip |
Fixed crash in asn1ct_check occuring for SEQUENCE with extension mark and component relation attribute.
Diffstat (limited to 'lib/asn1/src/asn1ct_check.erl')
-rw-r--r-- | lib/asn1/src/asn1ct_check.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl index 8b1ee6e601..efd731f052 100644 --- a/lib/asn1/src/asn1ct_check.erl +++ b/lib/asn1/src/asn1ct_check.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -6176,7 +6176,6 @@ componentrelation_leadingattr(_,[],_CompList,[],NewCompList) -> {false,lists:reverse(NewCompList)}; componentrelation_leadingattr(_,[],_CompList,LeadingAttr,NewCompList) -> {lists:last(LeadingAttr),lists:reverse(NewCompList)}; %send all info in Ts later - componentrelation_leadingattr(S,[C= #'ComponentType'{}|Cs],CompList,Acc,CompAcc) -> {LAAcc,NewC} = case catch componentrelation1(S,C#'ComponentType'.typespec, @@ -6229,7 +6228,10 @@ componentrelation_leadingattr(S,[C= #'ComponentType'{}|Cs],CompList,Acc,CompAcc) {[],C} end, componentrelation_leadingattr(S,Cs,CompList,LAAcc++Acc, - [NewC|CompAcc]). + [NewC|CompAcc]); +componentrelation_leadingattr(S,[NotComponentType|Cs],CompList,LeadingAttr,NewCompList) -> + componentrelation_leadingattr(S,Cs,CompList,LeadingAttr,[NotComponentType|NewCompList]). + object_set_mod_name(_S,ObjSet) when is_atom(ObjSet) -> ObjSet; |