diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-27 12:31:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-27 12:31:32 +0200 |
| commit | 81a0882fa92746907e69dea2f920b6c43292b663 (patch) | |
| tree | a3b7a4c0d902d7b2c7a2ff6987c31f9f30b20019 /lib/asn1 | |
| parent | 4bde8f52990bdddbd312a428ef4d727faebf5773 (diff) | |
| parent | 352887007496f0dcd72fbb4a228d3e3565f16a5b (diff) | |
| download | otp-81a0882fa92746907e69dea2f920b6c43292b663.tar.gz otp-81a0882fa92746907e69dea2f920b6c43292b663.tar.bz2 otp-81a0882fa92746907e69dea2f920b6c43292b663.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
ssl: Fixed compilation warnings
Corrected decoding to encorse a proper error return is there is tag mismatch
Diffstat (limited to 'lib/asn1')
| -rw-r--r-- | lib/asn1/src/asn1rt_ber_bin_v2.erl | 4 |
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) -> |