diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-18 13:59:24 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-18 13:59:24 +0100 |
| commit | b31843c0cdfe31a1a81f5c11b9dd288c120d9da5 (patch) | |
| tree | 9552dc2bd7210a0c6e1a5a597a50fdfc8f33e8c9 /lib/asn1/src/asn1rtt_ber.erl | |
| parent | 1c1b36997d766428e8213217d0700d9a5c72de0c (diff) | |
| parent | 71c653f463069d1ab4ddd502a13c4171188253f9 (diff) | |
| download | otp-b31843c0cdfe31a1a81f5c11b9dd288c120d9da5.tar.gz otp-b31843c0cdfe31a1a81f5c11b9dd288c120d9da5.tar.bz2 otp-b31843c0cdfe31a1a81f5c11b9dd288c120d9da5.zip | |
Merge branch 'bjorn/asn1/bug-fixes/OTP-10853'
* bjorn/asn1/bug-fixes/OTP-10853:
asn1ct: Eliminate use of obsolete size/1
Eliminate use of obsolete size/1 in generated code
BER: Fix broken table constraints inside a SET OF/SEQUENCE OF
Smoke test the 'der' option
der: Correct code generation for checking of empty sets
per,uper: Fix breakage of compilation of InformationFramework
Add NullTest
asn1_SUITE: Shorten the path to case-specific directory
asn1_SUITE: Don't add priv_dir to the code path
asn1 tests: Remove obsolete duplicates of ASN.1 specs
Diffstat (limited to 'lib/asn1/src/asn1rtt_ber.erl')
| -rw-r--r-- | lib/asn1/src/asn1rtt_ber.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1rtt_ber.erl b/lib/asn1/src/asn1rtt_ber.erl index 88292aca99..5fbf116747 100644 --- a/lib/asn1/src/asn1rtt_ber.erl +++ b/lib/asn1/src/asn1rtt_ber.erl @@ -868,7 +868,7 @@ remove_unused_then_dotag(TagIn,Unused,BinBits) -> encode_tags(TagIn, <<0>>, 1); 0 -> Bin = <<Unused,BinBits/binary>>, - encode_tags(TagIn,Bin,size(Bin)); + encode_tags(TagIn, Bin, byte_size(Bin)); Num -> N = byte_size(BinBits)-1, <<BBits:N/binary,LastByte>> = BinBits, |