diff options
| author | Björn Gustavsson <[email protected]> | 2013-03-06 07:40:02 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-05-31 14:52:18 +0200 |
| commit | a07a97291fcac1d3132a185d0efd7b4089720d90 (patch) | |
| tree | d0dcd598ffe216f304522733cec7e81439b8defd | |
| parent | f863775f492d31f4f38fc6e661dd6391810cfc37 (diff) | |
| download | otp-a07a97291fcac1d3132a185d0efd7b4089720d90.tar.gz otp-a07a97291fcac1d3132a185d0efd7b4089720d90.tar.bz2 otp-a07a97291fcac1d3132a185d0efd7b4089720d90.zip | |
PER/UPER: Remove support for a list argument for encode_open_type/1
Almost always, encode_open_type/1 is called with the return value
from complete/1, which always is a binary. In the rare situation
that encode_open_type/1 is called directly with data from the
user application, call iolist_to_binary/1 before calling
encode_open_type/1.
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_per.erl | 4 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_per_rt2ct.erl | 4 | ||||
| -rw-r--r-- | lib/asn1/src/asn1rtt_per.erl | 10 | ||||
| -rw-r--r-- | lib/asn1/src/asn1rtt_uper.erl | 4 |
4 files changed, 8 insertions, 14 deletions
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl index ec3d7f61ce..170a3c7352 100644 --- a/lib/asn1/src/asn1ct_gen_per.erl +++ b/lib/asn1/src/asn1ct_gen_per.erl @@ -207,7 +207,9 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) -> io_lib:format( "complete(enc_~s(~s))", [Tname,Value]); - _ -> Value + _ -> + io_lib:format("iolist_to_binary(~s)", + [Value]) end, call(Erules, encode_open_type, [NewValue]); #'ObjectClassFieldType'{} -> diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl index 8e9d90ae60..9fc6cea59a 100644 --- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl +++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl @@ -111,7 +111,9 @@ gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) -> io_lib:format( "complete(enc_~s(~s))", [Tname,Value]); - _ -> Value + _ -> + io_lib:format("iolist_to_binary(~s)", + [Value]) end, call(Erules, encode_open_type, [NewValue]); #'ObjectClassFieldType'{} -> diff --git a/lib/asn1/src/asn1rtt_per.erl b/lib/asn1/src/asn1rtt_per.erl index 74ae11632d..21acb4e1ec 100644 --- a/lib/asn1/src/asn1rtt_per.erl +++ b/lib/asn1/src/asn1rtt_per.erl @@ -146,15 +146,7 @@ set_choice_tag(_Alt,[],_Tag) -> %% | binary %% Contraint = not used in this version %% -encode_open_type(Val) when is_list(Val) -> - Bin = list_to_binary(Val), - case byte_size(Bin) of - Size when Size > 255 -> - [encode_length(Size),21,<<Size:16>>,Bin]; - Size -> - [encode_length(Size),20,Size,Bin] - end; -encode_open_type(Val) when is_binary(Val) -> +encode_open_type(Val) -> case byte_size(Val) of Size when Size > 255 -> [encode_length(Size),21,<<Size:16>>,Val]; % octets implies align diff --git a/lib/asn1/src/asn1rtt_uper.erl b/lib/asn1/src/asn1rtt_uper.erl index 8cf23a9239..320038caa2 100644 --- a/lib/asn1/src/asn1rtt_uper.erl +++ b/lib/asn1/src/asn1rtt_uper.erl @@ -175,9 +175,7 @@ set_choice_tag(_Alt,[],_Tag) -> %% | binary %% Contraint = not used in this version %% -encode_open_type(Val) when is_list(Val) -> - encode_open_type(list_to_binary(Val)); -encode_open_type(Val) when is_binary(Val) -> +encode_open_type(Val) -> [encode_length(byte_size(Val)),Val]. |