aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKenneth Lundin <[email protected]>2012-08-27 12:24:01 +0200
committerKenneth Lundin <[email protected]>2012-08-27 12:24:39 +0200
commit8ff84d9ed6afce5a46f546891d6b7bde59be89c4 (patch)
treee767d08ffc424699853ae5316457c4dda3ec020e /lib
parent3d70c115603add4d4a4c975a41bffa22b13e4c6f (diff)
parentd50a22593044f7a163d7d113f000ee8fc1cccfc6 (diff)
downloadotp-8ff84d9ed6afce5a46f546891d6b7bde59be89c4.tar.gz
otp-8ff84d9ed6afce5a46f546891d6b7bde59be89c4.tar.bz2
otp-8ff84d9ed6afce5a46f546891d6b7bde59be89c4.zip
Merge branch 'kenneth/asn1/error_tag_mismatch/OTP-10186' into maint
* kenneth/asn1/error_tag_mismatch/OTP-10186: Corrected decoding to encorse a proper error return is there is tag mismatch OTP-10186
Diffstat (limited to 'lib')
-rw-r--r--lib/asn1/src/asn1rt_ber_bin_v2.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1rt_ber_bin_v2.erl b/lib/asn1/src/asn1rt_ber_bin_v2.erl
index 17e66f77c9..420e3e1d91 100644
--- a/lib/asn1/src/asn1rt_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1rt_ber_bin_v2.erl
@@ -610,8 +610,8 @@ match_tags(Vlist = [{T,_V}|_], [T]) ->
Vlist;
match_tags(Tlv, []) ->
Tlv;
-match_tags({Tag,_V},[T|_Tt]) ->
- {error,{asn1,{wrong_tag,{Tag,T}}}}.
+match_tags(Tlv = {Tag,_V},[T|_Tt]) ->
+ exit({error,{asn1,{wrong_tag,{{expected,T},{got,Tag,Tlv}}}}}).
cindex(Ix,Val,Cname) ->