Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 10382186: Prevent the infinite loop inside SSLClientSocketNSS::OnSendComplete. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make changes suggested by rsleevi, exclude SSLClientSocketOpenSSL from this CL Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
===================================================================
--- net/socket/ssl_client_socket_nss.cc (revision 137212)
+++ net/socket/ssl_client_socket_nss.cc (working copy)
@@ -430,6 +430,7 @@
const SSLClientSocketContext& context)
: transport_send_busy_(false),
transport_recv_busy_(false),
+ transport_recv_eof_(false),
transport_(transport_socket),
host_and_port_(host_and_port),
ssl_config_(ssl_config),
@@ -633,6 +634,7 @@
user_write_callback_.Reset();
transport_send_busy_ = false;
transport_recv_busy_ = false;
+ transport_recv_eof_ = false;
user_read_buf_ = NULL;
user_read_buf_len_ = 0;
user_write_buf_ = NULL;
@@ -1219,6 +1221,7 @@
network_moved = DoTransportIO();
} while (rv_read == ERR_IO_PENDING &&
rv_write == ERR_IO_PENDING &&
+ (user_read_buf_ || user_write_buf_) &&
network_moved);
if (user_read_buf_ && rv_read != ERR_IO_PENDING)
@@ -1922,7 +1925,7 @@
if (rv > 0)
network_moved = true;
} while (rv > 0);
- if (BufferRecv() >= 0)
+ if (!transport_recv_eof_ && BufferRecv() >= 0)
network_moved = true;
}
LeaveFunction(network_moved);
@@ -1932,7 +1935,7 @@
// Return 0 for EOF,
// > 0 for bytes transferred immediately,
// < 0 for error (or the non-error ERR_IO_PENDING).
-int SSLClientSocketNSS::BufferSend(void) {
+int SSLClientSocketNSS::BufferSend() {
if (transport_send_busy_)
return ERR_IO_PENDING;
@@ -1971,7 +1974,7 @@
LeaveFunction("");
}
-int SSLClientSocketNSS::BufferRecv(void) {
+int SSLClientSocketNSS::BufferRecv() {
if (transport_recv_busy_) return ERR_IO_PENDING;
char* buf;
@@ -1990,8 +1993,11 @@
if (rv == ERR_IO_PENDING) {
transport_recv_busy_ = true;
} else {
- if (rv > 0)
+ if (rv > 0) {
memcpy(buf, recv_buffer_->data(), rv);
+ } else if (rv == 0) {
+ transport_recv_eof_ = true;
+ }
memio_PutReadResult(nss_bufs_, MapErrorToNSS(rv));
recv_buffer_ = NULL;
}
@@ -2006,6 +2012,8 @@
char* buf;
memio_GetReadParams(nss_bufs_, &buf);
memcpy(buf, recv_buffer_->data(), result);
+ } else if (result == 0) {
+ transport_recv_eof_ = true;
}
recv_buffer_ = NULL;
memio_PutReadResult(nss_bufs_, MapErrorToNSS(result));
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698