From 14c43c187018812d52c4f08bef3f8768d68dc7bc Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 15 Dec 2017 10:53:10 +0100
Subject: dtls: Correct UDP listener cleanup

---
 lib/ssl/src/dtls_udp_listener.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/ssl/src/dtls_udp_listener.erl b/lib/ssl/src/dtls_udp_listener.erl
index f2166a343e..12e54a0e51 100644
--- a/lib/ssl/src/dtls_udp_listener.erl
+++ b/lib/ssl/src/dtls_udp_listener.erl
@@ -153,15 +153,18 @@ handle_info({udp_error, Socket, Error}, #state{listner = Socket} = State) ->
 
 handle_info({'DOWN', _, process, Pid, _}, #state{clients = Clients,
 						 dtls_processes = Processes0,
+                                                 dtls_msq_queues = MsgQueues0,
                                                  close = ListenClosed} = State) ->
     Client = kv_get(Pid, Processes0),
     Processes = kv_delete(Pid, Processes0),
+    MsgQueues = kv_delete(Client, MsgQueues0),
     case ListenClosed andalso kv_empty(Processes) of
         true ->
             {stop, normal, State};
         false ->
             {noreply, State#state{clients = set_delete(Client, Clients),
-                                  dtls_processes = Processes}}
+                                  dtls_processes = Processes,
+                                  dtls_msq_queues = MsgQueues}}
     end.
 
 terminate(_Reason, _State) ->
-- 
cgit v1.2.3