diff options
| author | Björn Gustavsson <[email protected]> | 2013-10-18 14:23:39 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-10-18 14:23:39 +0200 |
| commit | 5a69967bf89327368cd45e000df054953fa74f10 (patch) | |
| tree | 41d79a3dbd953e21c0558f60c9f311974033c80b /lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl | |
| parent | 0aae26d8df1aba1f3a8551e4bf1fc097f13a0bea (diff) | |
| parent | 666b46a914ddc23ad666222476163c46c06d2b14 (diff) | |
| download | otp-5a69967bf89327368cd45e000df054953fa74f10.tar.gz otp-5a69967bf89327368cd45e000df054953fa74f10.tar.bz2 otp-5a69967bf89327368cd45e000df054953fa74f10.zip | |
Merge branch 'maint'
* maint:
Fix broken handling of default values for BIT STRINGs
Diffstat (limited to 'lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl')
| -rw-r--r-- | lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl index 8359b81b33..a38da8bcc2 100644 --- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl +++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl @@ -1155,7 +1155,8 @@ gen_dec_line(Erules,TopType,Cname,CTags,Type,OptOrMand,DecObjInf) -> emit([indent(4),"_ ->",nl]), case OptOrMand of - {'DEFAULT', Def} -> + {'DEFAULT', Def0} -> + Def = asn1ct_gen:conform_value(Type, Def0), emit([indent(8),"{",{asis,Def},",",{prev,tlv},"}",nl]); 'OPTIONAL' -> emit([indent(8),"{ asn1_NOVALUE, ",{prev,tlv},"}",nl]) |