Repository: trafficserver Updated Branches: refs/heads/6.0.x ba251df4d -> c562c9d91
[TS-3592]: null pointer protection. (cherry picked from commit b9df2ebd69bd132d23df4c34ab62f3a139f2f4ad) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c562c9d9 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c562c9d9 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c562c9d9 Branch: refs/heads/6.0.x Commit: c562c9d91f594666cbe889fe436cfebef6d2eb64 Parents: ba251df Author: Sudheer Vinukonda <[email protected]> Authored: Mon Sep 28 21:04:18 2015 +0000 Committer: Bryan Call <[email protected]> Committed: Wed Dec 2 13:28:05 2015 -0800 ---------------------------------------------------------------------- iocore/net/SSLNetVConnection.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c562c9d9/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index a235af7..f233434 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -888,9 +888,11 @@ SSLNetVConnection::free(EThread *t) this->con.close(); flags = 0; SET_CONTINUATION_HANDLER(this, (SSLNetVConnHandler)&SSLNetVConnection::startEvent); - nh->read_ready_list.remove(this); - nh->write_ready_list.remove(this); - nh = NULL; + if (nh) { + nh->read_ready_list.remove(this); + nh->write_ready_list.remove(this); + nh = NULL; + } read.triggered = 0; write.triggered = 0; read.enabled = 0;
