Repository: trafficserver Updated Branches: refs/heads/master c181e7eea -> 253c55a1c
TS-3865: CID 1317247 and 1317248: Null pointer dereference Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/253c55a1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/253c55a1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/253c55a1 Branch: refs/heads/master Commit: 253c55a1c33048584032e2343eb47259da7c272a Parents: c181e7e Author: shinrich <shinr...@yahoo-inc.com> Authored: Mon Aug 24 10:19:22 2015 -0500 Committer: shinrich <shinr...@yahoo-inc.com> Committed: Mon Aug 24 10:19:22 2015 -0500 ---------------------------------------------------------------------- iocore/net/UnixNetVConnection.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/253c55a1/iocore/net/UnixNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc index 12ba4a5..444c6cf 100644 --- a/iocore/net/UnixNetVConnection.cc +++ b/iocore/net/UnixNetVConnection.cc @@ -1388,10 +1388,8 @@ UnixNetVConnection::migrateToCurrentThread(Continuation *cont, EThread *t) this->do_io_close(); // Create new VC: - NetVConnection *new_vc = NULL; if (save_ssl) { - new_vc = sslNetProcessor.allocate_vc(t); - SSLNetVConnection *sslvc = dynamic_cast<SSLNetVConnection *>(new_vc); + SSLNetVConnection *sslvc = static_cast<SSLNetVConnection *>(sslNetProcessor.allocate_vc(t)); if (sslvc->populate(hold_con, cont, save_ssl) != EVENT_DONE) { sslvc->do_io_close(); sslvc = NULL; @@ -1399,8 +1397,7 @@ UnixNetVConnection::migrateToCurrentThread(Continuation *cont, EThread *t) return sslvc; // Update the SSL fields } else { - new_vc = netProcessor.allocate_vc(t); - UnixNetVConnection *netvc = dynamic_cast<UnixNetVConnection *>(new_vc); + UnixNetVConnection *netvc = static_cast<UnixNetVConnection *>(netProcessor.allocate_vc(t)); if (netvc->populate(hold_con, cont, save_ssl) != EVENT_DONE) { netvc->do_io_close(); netvc = NULL;
