mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-12-01 01:36:09 +03:00
Code Issues Projects Releases Wiki Activity

Check for null callbacks

Browse Source
This commit is contained in:
klzgrad 2018-01-23 01:52:09 -05:00
parent cdf25a4d4e
commit eb08ec17f2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/tools/naive/naive_client_connection.cc
View File

@ -72,9 +72,10 @@ int NaiveClientConnection::Connect(const CompletionCallback& callback) {
void NaiveClientConnection::Disconnect() { void NaiveClientConnection::Disconnect() {
full_duplex_ = false; full_duplex_ = false;
client_socket_->Disconnect(); // Closes server side first because latency is higher.
if (server_socket_handle_->socket()) if (server_socket_handle_->socket())
server_socket_handle_->socket()->Disconnect(); server_socket_handle_->socket()->Disconnect();
client_socket_->Disconnect();
next_state_ = STATE_NONE; next_state_ = STATE_NONE;
connect_callback_.Reset(); connect_callback_.Reset();
@ -221,8 +222,13 @@ void NaiveClientConnection::Push(StreamSocket* from,
} }
void NaiveClientConnection::OnIOError(StreamSocket* socket, int error) { void NaiveClientConnection::OnIOError(StreamSocket* socket, int error) {
// Avoids running run_callback_ again.
if (client_error_ < 0 || server_error_ < 0)
return;
if (socket == client_socket_.get()) { if (socket == client_socket_.get()) {
if (client_error_ == OK) { if (client_error_ == OK) {
DCHECK(run_callback_);
base::ResetAndReturn(&run_callback_).Run(error); base::ResetAndReturn(&run_callback_).Run(error);
} }
client_error_ = error; client_error_ = error;
@ -230,6 +236,7 @@ void NaiveClientConnection::OnIOError(StreamSocket* socket, int error) {
} }
if (socket == server_socket_handle_->socket()) { if (socket == server_socket_handle_->socket()) {
if (server_error_ == OK) { if (server_error_ == OK) {
DCHECK(run_callback_);
base::ResetAndReturn(&run_callback_).Run(error); base::ResetAndReturn(&run_callback_).Run(error);
} }
server_error_ = error; server_error_ = error;