| Index: net/socket/ssl_server_socket_nss.cc
|
| diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
|
| index 658aff7c6ed22f46a302558f3038d763b980bec8..c2681d3ee14436d6d9c3b33ee575aef62e02398d 100644
|
| --- a/net/socket/ssl_server_socket_nss.cc
|
| +++ b/net/socket/ssl_server_socket_nss.cc
|
| @@ -200,7 +200,7 @@ int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len,
|
| const CompletionCallback& callback) {
|
| DCHECK(user_read_callback_.is_null());
|
| DCHECK(user_handshake_callback_.is_null());
|
| - DCHECK(!user_read_buf_);
|
| + DCHECK(!user_read_buf_.get());
|
| DCHECK(nss_bufs_);
|
| DCHECK(!callback.is_null());
|
|
|
| @@ -223,7 +223,7 @@ int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len,
|
| int SSLServerSocketNSS::Write(IOBuffer* buf, int buf_len,
|
| const CompletionCallback& callback) {
|
| DCHECK(user_write_callback_.is_null());
|
| - DCHECK(!user_write_buf_);
|
| + DCHECK(!user_write_buf_.get());
|
| DCHECK(nss_bufs_);
|
| DCHECK(!callback.is_null());
|
|
|
| @@ -486,7 +486,7 @@ void SSLServerSocketNSS::OnSendComplete(int result) {
|
| if (!completed_handshake_)
|
| return;
|
|
|
| - if (user_write_buf_) {
|
| + if (user_write_buf_.get()) {
|
| int rv = DoWriteLoop(result);
|
| if (rv != ERR_IO_PENDING)
|
| DoWriteCallback(rv);
|
| @@ -505,7 +505,7 @@ void SSLServerSocketNSS::OnRecvComplete(int result) {
|
|
|
| // Network layer received some data, check if client requested to read
|
| // decrypted data.
|
| - if (!user_read_buf_ || !completed_handshake_)
|
| + if (!user_read_buf_.get() || !completed_handshake_)
|
| return;
|
|
|
| int rv = DoReadLoop(result);
|
| @@ -541,7 +541,8 @@ int SSLServerSocketNSS::BufferSend(void) {
|
| memcpy(send_buffer->data(), buf1, len1);
|
| memcpy(send_buffer->data() + len1, buf2, len2);
|
| rv = transport_socket_->Write(
|
| - send_buffer, len,
|
| + send_buffer.get(),
|
| + len,
|
| base::Bind(&SSLServerSocketNSS::BufferSendComplete,
|
| base::Unretained(this)));
|
| if (rv == ERR_IO_PENDING) {
|
| @@ -572,7 +573,8 @@ int SSLServerSocketNSS::BufferRecv(void) {
|
| } else {
|
| recv_buffer_ = new IOBuffer(nb);
|
| rv = transport_socket_->Read(
|
| - recv_buffer_, nb,
|
| + recv_buffer_.get(),
|
| + nb,
|
| base::Bind(&SSLServerSocketNSS::BufferRecvComplete,
|
| base::Unretained(this)));
|
| if (rv == ERR_IO_PENDING) {
|
| @@ -620,7 +622,7 @@ bool SSLServerSocketNSS::DoTransportIO() {
|
| }
|
|
|
| int SSLServerSocketNSS::DoPayloadRead() {
|
| - DCHECK(user_read_buf_);
|
| + DCHECK(user_read_buf_.get());
|
| DCHECK_GT(user_read_buf_len_, 0);
|
| int rv = PR_Read(nss_fd_, user_read_buf_->data(), user_read_buf_len_);
|
| if (rv >= 0)
|
| @@ -636,7 +638,7 @@ int SSLServerSocketNSS::DoPayloadRead() {
|
| }
|
|
|
| int SSLServerSocketNSS::DoPayloadWrite() {
|
| - DCHECK(user_write_buf_);
|
| + DCHECK(user_write_buf_.get());
|
| int rv = PR_Write(nss_fd_, user_write_buf_->data(), user_write_buf_len_);
|
| if (rv >= 0)
|
| return rv;
|
|
|