Merge tag 'OTP-20.0' into sverker/20/binary_to_atom-utf8-crash/ERL-474/OTP-14590

11 files changed, 64 insertions, 43 deletions

diff --git a/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl b/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl
index 545be62852..88049a509f 100644
--- a/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl
+++ b/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -610,11 +610,16 @@ convert_list([{N, T, _O}|Rest], HowMany, Counter, Acc) ->
 %% Returns    : 
 %%----------------------------------------------------------------------
 destroy(OE_THIS, OE_State) ->
-    case corba:get_subobject_key(OE_THIS) of
-	<<131,100,0,9,117,110,100,101,102,105,110,101,100>> ->
-	    %% undefined binary.
-	    corba:raise(#'NO_PERMISSION'{completion_status=?COMPLETED_NO});
-	SubobjKey ->
+    SubobjKey = corba:get_subobject_key(OE_THIS),
+    try begin
+            true = (byte_size(SubobjKey) < 20),
+            undefined = binary_to_term(SubobjKey)
+        end
+    of
+        _ ->
+            corba:raise(#'NO_PERMISSION'{completion_status=?COMPLETED_NO})
+    catch
+        error:_ ->  %% Not atom 'undefined', carry on...
 	    _DF = 
 		fun() ->
 			case mnesia:wread({orber_CosNaming, SubobjKey}) of
@@ -624,12 +629,7 @@ destroy(OE_THIS, OE_State) ->
 				orber:dbg("[~p] ~p:destroy(~p);~n"
 					  "DB access returned ~p", 
 					  [?LINE, ?MODULE, SubobjKey, Other], ?DEBUG_LEVEL),
-				{'EXCEPTION', #'CosNaming_NamingContext_NotEmpty'{}};
-			    Other ->
-				orber:dbg("[~p] ~p:destroy(~p);~n"
-					  "DB access returned ~p", 
-					  [?LINE, ?MODULE, SubobjKey, Other], ?DEBUG_LEVEL),
-				{'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}
+				{'EXCEPTION', #'CosNaming_NamingContext_NotEmpty'{}}
 			end
 		end,
 	    case mnesia:transaction(_DF) of 
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 89f258e5e9..5a82270b28 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -33,6 +33,20 @@
     <file>notes.xml</file>
   </header>
 
+  <section><title>Orber 3.8.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix some dialyzer warnings</p>
+          <p>
+	    Own Id: OTP-14006</p>
+        </item>
+      </list>
+    </section>
+
+  </section>
 
   <section><title>Orber 3.8.2</title>
 
diff --git a/lib/orber/src/cdr_encode.erl b/lib/orber/src/cdr_encode.erl
index f922b330a0..2c42d5bd7e 100644
--- a/lib/orber/src/cdr_encode.erl
+++ b/lib/orber/src/cdr_encode.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -683,7 +683,7 @@ enc_fixed(_Env, Digits, Scale, Fixed, _Bytes, _Len) ->
     orber:dbg("[~p] cdr_encode:enc_fixed(~p, ~p, ~p)~n"
 	      "The supplied fixed type incorrect. Check that the 'digits' and 'scale' field~n"
 	      "match the definition in the IDL-specification. The value field must be~n"
-	      "a list of Digits lenght.", 
+	      "a list of Digits length.", 
 	      [?LINE, Digits, Scale, Fixed], ?DEBUG_LEVEL),
     corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE}).
 
diff --git a/lib/orber/src/corba.erl b/lib/orber/src/corba.erl
index faebbc4059..23ce01ffc3 100644
--- a/lib/orber/src/corba.erl
+++ b/lib/orber/src/corba.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -2115,7 +2115,7 @@ call_RQprotected(Module, Obj, Func, Args, GroupID, RQCtx) ->
 			 sticky_write),
 	    Reply;
 	% retransmitted request
-	#ft_reply_retention{reply = Reply} ->
+	[#ft_reply_retention{reply = Reply}] ->
 	    Reply
     end.
 
diff --git a/lib/orber/src/orber_ifr_contained.erl b/lib/orber/src/orber_ifr_contained.erl
index d5f41fbe72..2a67fa98fd 100644
--- a/lib/orber/src/orber_ifr_contained.erl
+++ b/lib/orber/src/orber_ifr_contained.erl
@@ -232,7 +232,7 @@ move(true, Contained_objref, New_container, New_name, New_version) ->
 			       lists:filter(fun(X) -> X /= Contained_objref
 					    end, select(Old_container_obj,
 							contents))),
-		 New_container_obj = mnesia:read(New_container),
+		 [New_container_obj] = mnesia:read(New_container),
 		 Contents = orber_ifr_container:contents(New_container, dk_All,
 							 true),
 		 New_new_container_obj =
diff --git a/lib/orber/src/orber_iiop.hrl b/lib/orber/src/orber_iiop.hrl
index 6bc82fb6d6..ec502b6f09 100644
--- a/lib/orber/src/orber_iiop.hrl
+++ b/lib/orber/src/orber_iiop.hrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -279,8 +279,8 @@
 %%----------------------------------------------------------------------
 %% Profile Body
 %%
-%% iiop_version: describes the version of IIOP that the agent at the 
-%%		specified adress is prepared to receive.
+%% iiop_version: describes the version of IIOP that the agent at the
+%%		specified address is prepared to receive.
 %% host: identifies the internet host to which the GIOP messages
 %%		for the specified object may be sent.
 %% port: contains the TCP?IP port number where the target agnet is listening
diff --git a/lib/orber/src/orber_initial_references.erl b/lib/orber/src/orber_initial_references.erl
index 738d702088..9140563881 100644
--- a/lib/orber/src/orber_initial_references.erl
+++ b/lib/orber/src/orber_initial_references.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -89,7 +89,7 @@ install(Timeout, Options) ->
 		end,
     
     Wait = mnesia:wait_for_tables([orber_references], Timeout),
-    %% Check if any error has occured yet. If there are errors, return them.
+    %% Check if any error has occurred yet. If there are errors, return them.
     if
 	DB_Result == {atomic, ok},
 	Wait == ok ->
diff --git a/lib/orber/src/orber_objectkeys.erl b/lib/orber/src/orber_objectkeys.erl
index 1233e4e721..12ed1a2f85 100644
--- a/lib/orber/src/orber_objectkeys.erl
+++ b/lib/orber/src/orber_objectkeys.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -344,7 +344,7 @@ install(Timeout, Options) ->
 		end,
     
     Wait = mnesia:wait_for_tables([orber_objkeys], Timeout),
-    %% Check if any error has occured yet. If there are errors, return them.
+    %% Check if any error has occurred yet. If there are errors, return them.
     if
 	DB_Result == {atomic, ok},
 	Wait == ok ->
diff --git a/lib/orber/test/multi_ORB_SUITE.erl b/lib/orber/test/multi_ORB_SUITE.erl
index d739e47cc1..3c5bb0b5e5 100644
--- a/lib/orber/test/multi_ORB_SUITE.erl
+++ b/lib/orber/test/multi_ORB_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -135,13 +135,12 @@ cases() ->
      setup_multi_connection_timeout_api,
      setup_multi_connection_timeout_attempts_api,
      setup_multi_connection_timeout_random_api,
-     ssl_1_multi_orber_api,
      ssl_1_multi_orber_generation_3_api,
-     ssl_2_multi_orber_api,
      ssl_2_multi_orber_generation_3_api,
-     ssl_reconfigure_api,
      ssl_reconfigure_generation_3_api].
 
+% ssl_1_multi_orber_api,ssl_2_multi_orber_api,ssl_reconfigure_api,
+
 %%-----------------------------------------------------------------
 %% Init and cleanup functions.
 %%-----------------------------------------------------------------
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index 95ab26cd30..9b19c4bc4e 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -356,11 +356,17 @@ get_options(ssl, Role, Level) ->
 
 get_options(ssl, Role, 2, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    [{depth, 2},
-     {verify, 2},
-     {keyfile, filename:join([Dir, Role, "key.pem"])},
-     {cacertfile, filename:join([Dir, Role, "cacerts.pem"])},
-     {certfile, filename:join([Dir, Role, "cert.pem"])} |Options];
+    Options1 = [{depth, 2},
+                {verify, 2},
+                {keyfile, filename:join([Dir, Role, "key.pem"])},
+                {cacertfile, filename:join([Dir, Role, "cacerts.pem"])},
+                {certfile, filename:join([Dir, Role, "cert.pem"])} |Options],
+    case Role of
+        client ->
+            [{server_name_indication, disable} |Options1];
+        server ->
+            Options1
+    end;
 get_options(iiop_ssl, _Role, 2, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
     [{ssl_server_options, [{depth, 2},
@@ -369,10 +375,11 @@ get_options(iiop_ssl, _Role, 2, Options) ->
 			{cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
 			{keyfile, filename:join([Dir, "server", "key.pem"])}]},
      {ssl_client_options, [{depth, 2},
-			{verify, 2},
-			{certfile, filename:join([Dir, "client", "cert.pem"])},
-			{cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
-			{keyfile, filename:join([Dir, "client", "key.pem"])}]},
+                           {verify, 2},
+                           {server_name_indication, disable},
+                           {certfile, filename:join([Dir, "client", "cert.pem"])},
+                           {cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
+                           {keyfile, filename:join([Dir, "client", "key.pem"])}]},
      {secure, ssl} |Options];
 get_options(iiop_ssl, _Role, 1, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
@@ -382,10 +389,11 @@ get_options(iiop_ssl, _Role, 1, Options) ->
 			{cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
 			{keyfile, filename:join([Dir, "server", "key.pem"])}]},
      {ssl_client_options, [{depth, 1},
-			{verify, 0},
-			{certfile, filename:join([Dir, "client", "cert.pem"])},
-			{cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
-			{keyfile, filename:join([Dir, "client", "key.pem"])}]},
+                           {verify, 0},
+                           {server_name_indication, disable},
+                           {certfile, filename:join([Dir, "client", "cert.pem"])},
+                           {cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
+                           {keyfile, filename:join([Dir, "client", "key.pem"])}]},
      {secure, ssl} |Options].
 
 create_paths() ->
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index dcb2c985a3..595e686cb7 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1 +1 @@
-ORBER_VSN = 3.8.2
+ORBER_VSN = 3.8.3