Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 173 insertions, 169 deletions

diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index 60b2b2b42e..1b4c3b3c77 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -1,54 +1,98 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
 %%
 -module(asn1_test_lib).
 
--export([compile/3]).
--export([compile_all/3]).
--export([compile_erlang/3]).
--export([hex_to_bin/1]).
+-export([compile/3,compile_all/3,compile_erlang/3,
+	 rm_dirs/1,
+	 hex_to_bin/1,
+	 match_value/2,
+	 parallel/0,
+	 roundtrip/3,roundtrip/4,roundtrip_enc/3,roundtrip_enc/4]).
 
--export([ticket_7407_compile/2,ticket_7407_code/1, ticket_7678/2,
-         ticket_7708/2, ticket_7763/1, ticket_7876/3]).
+-include_lib("common_test/include/ct.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+run_dialyzer() ->
+    false.
 
 compile(File, Config, Options) -> compile_all([File], Config, Options).
 
 compile_all(Files, Config, Options) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
-    [compile_file(filename:join(DataDir, F), [{outdir, CaseDir}|Options])
+    DataDir = proplists:get_value(data_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
+    [compile_file(filename:join(DataDir, F), [{outdir, CaseDir},
+					      debug_info|Options])
          || F <- Files],
+    dialyze(Files, Options),
     ok.
 
+parallel() ->
+    case erlang:system_info(schedulers) > 1 andalso not run_dialyzer() of
+        true  -> [parallel];
+        false -> []
+    end.
+
+dialyze(Files, Options) ->
+    case not run_dialyzer() orelse lists:member(abs, Options) of
+	true -> ok;
+	false -> dialyze(Files)
+    end.
+
+dialyze(Files) ->
+    Beams0 = [code:which(module(F)) || F <- Files],
+    Beams = [code:which(asn1rt_nif)|Beams0],
+    case dialyzer:run([{files,Beams},
+		       {warnings,[]},
+		       {get_warnings,true}]) of
+	[] ->
+	    ok;
+	[_|_]=Ws ->
+	    io:put_chars([[B,$\n] || B <- Beams]),
+	    io:put_chars([dialyzer:format_warning(W) || W <- Ws]),
+	    error(dialyzer_warnings)
+    end.
+
+module(F0) ->
+    F1 = filename:basename(F0),
+    F2 = case filename:extension(F1) of
+	     ".asn" ->
+		 filename:rootname(F1);
+	     ".asn1" ->
+		 filename:rootname(F1);
+	     ".py" ->
+		 filename:rootname(F1);
+	     "" ->
+		 F1
+	 end,
+    F = case filename:extension(F2) of
+	    ".set" ->
+		filename:rootname(F2);
+	    "" ->
+		F2
+	end,
+    list_to_atom(F).
+%%    filename:join(CaseDir, F ++ ".beam").
+
 compile_file(File, Options) ->
     try
-        ok = asn1ct:compile(File, [warnings_as_errors|Options]),
-        case should_load(File, Options) of
-            false ->
-                ok;
-            {module, Module} ->
-                code:purge(Module),
-                {module, Module} = code:load_file(Module),
-		code:purge(Module)
-        end
+        ok = asn1ct:compile(File, [warnings_as_errors|Options])
     catch
         Class:Reason ->
 	    ct:print("Failed to compile ~s\n", [File]),
@@ -56,162 +100,122 @@ compile_file(File, Options) ->
     end.
 
 compile_erlang(Mod, Config, Options) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    CaseDir = proplists:get_value(case_dir, Config),
     M = list_to_atom(Mod),
     {ok, M} = compile:file(filename:join(DataDir, Mod),
                            [report,{i,CaseDir},{outdir,CaseDir}|Options]).
 
+rm_dirs([Dir|Dirs]) ->
+    {ok,L0} = file:list_dir(Dir),
+    L = [filename:join(Dir, F) || F <- L0],
+    IsDir = fun(F) -> filelib:is_dir(F) end,
+    {Subdirs,Files} = lists:partition(IsDir, L),
+    _ = [ok = file:delete(F) || F <- Files],
+    rm_dirs(Subdirs),
+    ok = file:del_dir(Dir),
+    rm_dirs(Dirs);
+rm_dirs([]) ->
+    ok.
+
 hex_to_bin(S) ->
     << <<(hex2num(C)):4>> || C <- S, C =/= $\s >>.
 
-%%%
-%%% Internal functions.
-%%%
+%% match_value(Pattern, Value) -> ok.
+%%  Match Pattern against Value. If the Pattern contains in any
+%%  position, the corresponding position in the Value can be
+%%  anything. Generate an exception if the Pattern and Value don't
+%%  match.
+
+match_value('_', _) ->
+    ok;
+match_value([H1|T1], [H2|T2]) ->
+    match_value(H1, H2),
+    match_value(T1, T2);
+match_value(T1, T2) when tuple_size(T1) =:= tuple_size(T2) ->
+    match_value_tuple(1, T1, T2);
+match_value(Same, Same) ->
+    ok;
+match_value(V1, V2) ->
+    error({nomatch,V1,V2}).
+
+roundtrip(Mod, Type, Value) ->
+    roundtrip(Mod, Type, Value, Value).
+
+roundtrip(Mod, Type, Value, ExpectedValue) ->
+    {ok,Encoded} = Mod:encode(Type, Value),
+    {ok,ExpectedValue} = Mod:decode(Type, Encoded),
+    test_ber_indefinite(Mod, Type, Encoded, ExpectedValue),
+    ok.
 
-should_load(File, Options) ->
-    case lists:member(abs, Options) of
-	true ->
-	    false;
-	false ->
-	    {module,list_to_atom(strip_extension(filename:basename(File)))}
-    end.
+roundtrip_enc(Mod, Type, Value) ->
+    roundtrip_enc(Mod, Type, Value, Value).
 
-strip_extension(File) ->
-    strip_extension(File, filename:extension(File)).
+roundtrip_enc(Mod, Type, Value, ExpectedValue) ->
+    {ok,Encoded} = Mod:encode(Type, Value),
+    {ok,ExpectedValue} = Mod:decode(Type, Encoded),
+    test_ber_indefinite(Mod, Type, Encoded, ExpectedValue),
+    Encoded.
 
-strip_extension(File, "") ->
-    File;
-strip_extension(File, Ext) when Ext == ".asn"; Ext == ".set"; Ext == ".asn1"->
-    strip_extension(filename:rootname(File));
-strip_extension(File, _Ext) ->
-    File.
+%%%
+%%% Internal functions.
+%%%
 
 hex2num(C) when $0 =< C, C =< $9 -> C - $0;
 hex2num(C) when $A =< C, C =< $F -> C - $A + 10;
 hex2num(C) when $a =< C, C =< $f -> C - $a + 10.
 
-ticket_7407_compile(Config,Option) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-
-    ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-7407",
-			      [uper, {outdir,OutDir}]++Option).
-
-ticket_7708(Config,Option) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-    
-    ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper, {outdir,OutDir}]++Option).
-    
-
-ticket_7407_code(FinalPadding) ->
-    Msg1 = {Type1,_} = eutra1(msg),
-    ?line {ok,B1} = 'EUTRA-extract-7407':encode(Type1,Msg1),
-    ?line B1 = eutra1(result,FinalPadding),
-    
-    Msg2 = {Type2,_} = eutra2(msg),
-    ?line {ok,B2} = 'EUTRA-extract-7407':encode(Type2,Msg2),
-    ?line B2 = eutra2(result,FinalPadding),
-    ok.
-
-eutra1(msg) ->
-    {'BCCH-BCH-Message',{'MasterInformationBlock',[0,1,0,1],[1,0,1,0],{'PHICH-Configuration',short,ffs},[1,0,1,0,0,0,0,0]}}.
-eutra1(result,true) ->
-    <<90,80,0>>;
-eutra1(result,false) ->
-    <<90,80,0:1>>.
-
-eutra2(msg) ->
-    {'BCCH-DL-SCH-Message',
-     {c1,
-      {systemInformation1,
-       {'SystemInformationBlockType1',
-	{'SystemInformationBlockType1_cellAccessRelatedInformation',
-	 [{'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},true},
-	  {'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},false},
-	  {'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},true}],
-	 {'TrackingAreaCode'},
-	 {'CellIdentity'},
-	 false,
-	 true,
-	 true,
-	 true
-	},
-	{'SystemInformationBlockType1_cellSelectionInfo',-50},
-	24,
-	[{'SystemInformationBlockType1_schedulinInformation_SEQOF',
-	  {'SystemInformationBlockType1_schedulinInformation_SEQOF_si-MessageType'},
-	  ms320,
-	  {'SystemInformationBlockType1_schedulinInformation_SEQOF_sib-MappingInfo'}}],
-	0
-       }
-      }
-     }
-    }.
-eutra2(result,true) ->
-%% 55 5C A5 E0
-    <<85,92,165,224>>;
-eutra2(result,false) ->
-    <<85,92,165,14:4>>.
-
-
-
-ticket_7678(Config, Option) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-
-    ?line ok = asn1ct:compile(DataDir ++ "UPERDefault",
-			      [uper, {outdir,OutDir}]++Option),
-    
-    ?line Val = 'UPERDefault':seq(),
-    ?line {ok,<<0,6,0>>} = 'UPERDefault':encode('Seq',Val),
-    ?line {ok,Val} = 'UPERDefault':decode('Seq',<<0,6,0>>),
+match_value_tuple(I, T1, T2) when I =< tuple_size(T1) ->
+    match_value(element(I, T1), element(I, T2)),
+    match_value_tuple(I+1, T1, T2);
+match_value_tuple(_, _, _) ->
     ok.
 
+test_ber_indefinite(Mod, Type, Encoded, ExpectedValue) ->
+    case Mod:encoding_rule() of
+	ber ->
+	    Indefinite = iolist_to_binary(ber_indefinite(Encoded)),
+	    {ok,ExpectedValue} = Mod:decode(Type, Indefinite);
+	_ ->
+	    ok
+    end.
 
-ticket_7763(Config) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-
-    ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper, {outdir,OutDir}]),
-    Val = {'Seq',15,lists:duplicate(8,0),[0],lists:duplicate(28,0),15,true},
-    ?line {ok,Bin} = 'EUTRA-extract-55':encode('Seq',Val),
-
-    ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [uper,compact_bit_string,{outdir,OutDir}]),
-    CompactVal = {'Seq',15,{0,<<0>>},{7,<<0>>},{4,<<0,0,0,0>>},15,true},
-    {ok,CompactBin} = 'EUTRA-extract-55':encode('Seq',CompactVal),
-
-    ?line Bin = CompactBin,
-
-    io:format("CompactBin:~n~p~nBin:~n~p~nCompactBin == Bin is ~p~n",[CompactBin,Bin,CompactBin == Bin]).
-    
-
-ticket_7876(Config,Erule,Options) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-
-    ?line ok = asn1ct:compile(DataDir ++ "S1AP-CommonDataTypes",
-			      [Erule,{outdir,OutDir}|Options]),
-    ?line ok = asn1ct:compile(DataDir ++ "S1AP-Constants",
-			      [Erule,{outdir,OutDir}|Options]),
-?line ok = asn1ct:compile(DataDir ++ "S1AP-Containers",
-			      [Erule,{outdir,OutDir}|Options]),
-?line ok = asn1ct:compile(DataDir ++ "S1AP-IEs",
-			      [Erule,{outdir,OutDir}|Options]),
-?line ok = asn1ct:compile(DataDir ++ "S1AP-PDU-Contents",
-			      [Erule,{outdir,OutDir}|Options]),
-?line ok = asn1ct:compile(DataDir ++ "S1AP-PDU-Descriptions",
-			      [Erule,{outdir,OutDir}|Options]),
-
-    ticket_7876_encdec(Erule),
-    ok.
+%% Rewrite all definite lengths for constructed values to an
+%% indefinite length.
+ber_indefinite(Bin0) ->
+    case ber_get_tag(Bin0) of
+	done ->
+	    [];
+	primitive ->
+	    Bin0;
+	{constructed,Tag,Bin1} ->
+	    {Len,Bin2} = ber_get_len(Bin1),
+	    <<Val0:Len/binary,Bin/binary>> = Bin2,
+	    Val = iolist_to_binary(ber_indefinite(Val0)),
+	    [<<Tag/binary,16#80,Val/binary,0,0>>|ber_indefinite(Bin)]
+    end.
 
-ticket_7876_encdec(per) ->
-    ?line {ok,{initiatingMessage,_}} = 'S1AP-PDU-Descriptions':decode('S1AP-PDU', [0,2,64,49,0,0,5,0,0,0,4,128,106,56,197,0,8,0,3,64,2,134,0,100,64,8,0,66,240,153,0,7,192,16,0,67,64,6,0,66,240,153,70,1,0,107,64,5,0,0,0,0,0]);
-ticket_7876_encdec(_) ->
-    ?line {ok,{initiatingMessage,_}} = 'S1AP-PDU-Descriptions':decode('S1AP-PDU', <<0,2,64,49,0,0,5,0,0,0,4,128,106,56,197,0,8,0,3,64,2,134,0,100,64,8,0,66,240,153,0,7,192,16,0,67,64,6,0,66,240,153,70,1,0,107,64,5,0,0,0,0,0>>).
+ber_get_tag(<<>>) ->
+    done;
+ber_get_tag(<<_:2,0:1,_:5,_/binary>>) ->
+    primitive;
+ber_get_tag(<<_:2,1:1,_:5,_/binary>>=Bin0) ->
+    TagLen = ber_tag_length(Bin0),
+    <<Tag:TagLen/binary,Bin/binary>> = Bin0,
+    {constructed,Tag,Bin}.
+
+ber_tag_length(<<_:3,2#11111:5,T/binary>>) ->
+    ber_tag_length_1(T, 1);
+ber_tag_length(_) ->
+    1.
+
+ber_tag_length_1(<<1:1,_:7,T/binary>>, N) ->
+    ber_tag_length_1(T, N+1);
+ber_tag_length_1(<<0:1,_:7,_/binary>>, N) ->
+    N+1.
+
+ber_get_len(<<0:1,L:7,T/binary>>) ->
+    {L,T};
+ber_get_len(<<1:1,Octets:7,T0/binary>>) ->
+    <<L:Octets/unit:8,T/binary>> = T0,
+    {L,T}.