aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-19 15:45:01 +0100
committerIngela Anderton Andin <[email protected]>2012-11-19 15:45:01 +0100
commit608ae226acd4c6340c66ce6038436f849b735673 (patch)
tree633cc3caaf0766c390215d7024cb300f3efc098d /lib/ssl/src
parent6a7e9265837bf2521508bd5fbc19b54e1dc4b88f (diff)
parenta69dc6d28744ff9e17e2ef1bfab663a4a8cae8d0 (diff)
downloadotp-608ae226acd4c6340c66ce6038436f849b735673.tar.gz
otp-608ae226acd4c6340c66ce6038436f849b735673.tar.bz2
otp-608ae226acd4c6340c66ce6038436f849b735673.zip
Merge branch 'ia/ssl/dialyzer-found-bug' into maint
* ia/ssl/dialyzer-found-bug: ssl: Fix bug in match expression found by Dialyzer
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl_connection.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index c1086a09ef..eb71bc61e9 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -2478,9 +2478,9 @@ handle_unrecv_data(StateName, #state{socket = Socket, transport_cb = Transport}
handle_close_alert(Data, StateName, State)
end.
-handle_close_alert(Data, StateName, State) ->
- case next_tls_record(Data, State) of
- #ssl_tls{type = ?ALERT, fragment = EncAlerts} ->
+handle_close_alert(Data, StateName, State0) ->
+ case next_tls_record(Data, State0) of
+ {#ssl_tls{type = ?ALERT, fragment = EncAlerts}, State} ->
[Alert|_] = decode_alerts(EncAlerts),
handle_normal_shutdown(Alert, StateName, State);
_ ->