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

1 files changed, 22 insertions, 18 deletions

diff --git a/lib/debugger/src/dbg_iserver.erl b/lib/debugger/src/dbg_iserver.erl
index 31a856545f..3561454685 100644
--- a/lib/debugger/src/dbg_iserver.erl
+++ b/lib/debugger/src/dbg_iserver.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1998-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/.
-%% 
-%% 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.
+%% 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
+%%
+%%     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%
 %%
@@ -71,17 +72,17 @@ cast(Int, Request) ->
     gen_server:cast(Int, Request).
 
 safe_call(Request) ->
-    ensure_started(),
+    {ok, _} = ensure_started(),
     call(Request).
 
 safe_cast(Request) ->
-    ensure_started(),
+    {ok, _} = ensure_started(),
     cast(Request).
 
 ensure_started() ->
     case whereis(?MODULE) of
 	undefined -> start();
-	_Pid -> ignore
+	Pid -> {ok, Pid}
     end.
 
 %%--Module database---------------------------------------------------
@@ -401,8 +402,10 @@ handle_cast({set_status, Meta, Status, Info}, State) ->
     send_all(subscriber, {new_status, Proc#proc.pid, Status, Info}, State),
     if
 	Status =:= break ->
-	    auto_attach(break, State#state.auto, Proc);
-	true -> ignore
+	    _ = auto_attach(break, State#state.auto, Proc),
+	    ok;
+	true ->
+	    ok
     end,
     Proc2 = Proc#proc{status=Status, info=Info},
     {noreply, State#state{procs=lists:keyreplace(Meta, #proc.meta,
@@ -469,7 +472,7 @@ handle_info({'EXIT',Who,Why}, State) ->
 				      [self(),AttPid,Pid,Why,ExitInfo]);
 		       undefined ->
 			   %% Otherwise, auto attach if necessary
-			   auto_attach(exit, State#state.auto, Pid),
+			   _ = auto_attach(exit, State#state.auto, Pid),
 			   Who
 		   end,
 	    send_all(subscriber, {new_status,Pid,exit,Why}, State),
@@ -582,7 +585,8 @@ send_all(Pids, Msg) ->
     lists:foreach(fun(Pid) -> send(Pid, Msg) end, Pids).
 
 send(Pid, Msg) ->
-    Pid ! {int, Msg}.
+    Pid ! {int, Msg},
+    ok.
 
 get_proc({Type, Pid}, Procs) ->
     Index = case Type of