You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2015/07/02 17:31:45 UTC
[1/3] trafficserver git commit: [TS-3735]: Coverity CID 1309076 -
Null pointer dereferences.
Repository: trafficserver
Updated Branches:
refs/heads/master 0b2c2f96d -> ee446f9c4
[TS-3735]: Coverity CID 1309076 - Null pointer dereferences.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/946fc244
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/946fc244
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/946fc244
Branch: refs/heads/master
Commit: 946fc2447100e144505f5ea439db22d30a9eb0cf
Parents: 0b2c2f9
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Thu Jul 2 15:23:54 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Thu Jul 2 15:23:54 2015 +0000
----------------------------------------------------------------------
iocore/net/SSLNetVConnection.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/946fc244/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index d7cb887..9b1570c 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -494,9 +494,9 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
// in the ssl buffers, so, SSL_read if there's anything already..
Debug("ssl", "ssl handshake completed on vc %p, check to see if first byte, is already in the ssl buffers", this);
this->iobuf = new_MIOBuffer(BUFFER_SIZE_INDEX_4K);
- this->reader = this->iobuf->alloc_reader();
- s->vio.buffer.writer_for(this->iobuf);
if (this->iobuf) {
+ this->reader = this->iobuf->alloc_reader();
+ s->vio.buffer.writer_for(this->iobuf);
ret = ssl_read_from_net(this, lthread, r);
if (ret == SSL_READ_EOS) {
this->eosRcvd = true;
@@ -505,6 +505,8 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
if (r > 0 || pending > 0) {
Debug("ssl", "ssl read right after handshake, read %" PRId64 ", pending %d bytes, for vc %p", r, pending, this);
}
+ } else {
+ Error("failed to allocate MIOBuffer after handshake, vc %p", this);
}
read.triggered = 0;
read_disable(nh, this);
[2/3] trafficserver git commit: [TS-3735]: Coverity CID 1309075 -
Incorrect expression.
Posted by su...@apache.org.
[TS-3735]: Coverity CID 1309075 - Incorrect expression.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/785439f0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/785439f0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/785439f0
Branch: refs/heads/master
Commit: 785439f0bde62f43bc2e7df0d49e77c42a3c0f79
Parents: 946fc24
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Thu Jul 2 15:26:19 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Thu Jul 2 15:26:19 2015 +0000
----------------------------------------------------------------------
iocore/net/SSLNetVConnection.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/785439f0/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 9b1570c..1f965fe 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -466,7 +466,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
readSignalError(nh, err);
} else if (ret == SSL_HANDSHAKE_WANT_READ || ret == SSL_HANDSHAKE_WANT_ACCEPT || ret == EVENT_CONT) {
if (SSLConfigParams::ssl_handshake_timeout_in > 0) {
- double handshake_time = ((Thread::get_hrtime() - sslHandshakeBeginTime) / 1000000000);
+ double handshake_time = ((double)(Thread::get_hrtime() - sslHandshakeBeginTime) / 1000000000);
Debug("ssl", "ssl handshake for vc %p, took %.3f seconds, configured handshake_timer: %d", this, handshake_time,
SSLConfigParams::ssl_handshake_timeout_in);
if (handshake_time > SSLConfigParams::ssl_handshake_timeout_in) {
[3/3] trafficserver git commit: [TS-3735]: Coverity CID 1309077 -
Control flow issues.
Posted by su...@apache.org.
[TS-3735]: Coverity CID 1309077 - Control flow issues.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ee446f9c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ee446f9c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ee446f9c
Branch: refs/heads/master
Commit: ee446f9c42ece4bb0e6a7fe4a08d17f367a0a352
Parents: 785439f
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Thu Jul 2 15:30:57 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Thu Jul 2 15:30:57 2015 +0000
----------------------------------------------------------------------
proxy/http/HttpSM.cc | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ee446f9c/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 1694e31..cbcc34b 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -582,6 +582,9 @@ HttpSM::state_read_client_request_header(int event, void *data)
case VC_EVENT_EOS:
ua_entry->eos = true;
+ if ((client_request_hdr_bytes > 0) && is_transparent_passthrough_allowed() && (ua_raw_buffer_reader != NULL)) {
+ break;
+ }
// Fall through
case VC_EVENT_ERROR:
case VC_EVENT_INACTIVITY_TIMEOUT: