Skip to content

TS-4938: Avoid crashes due to NULL vc dereferences.#1232

Merged
PSUdaemon merged 1 commit intoapache:6.2.xfrom
sekimura:ts-4938-backport
Nov 28, 2016
Merged

TS-4938: Avoid crashes due to NULL vc dereferences.#1232
PSUdaemon merged 1 commit intoapache:6.2.xfrom
sekimura:ts-4938-backport

Conversation

@sekimura
Copy link
Copy Markdown
Contributor

Potentially this could fix TS-5046 SEGV HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)

cherry picked from commit 784e7cc

Conflicts:
proxy/http/HttpSM.cc
proxy/http/HttpServerSession.h

One more null check.

Remove server_session null checks.  And address James' comments.

clang-format

(cherry picked from commit 784e7cc)

Conflicts:
	proxy/http/HttpSM.cc
	proxy/http/HttpServerSession.h
@PSUdaemon PSUdaemon added the Backport Marked for backport for an LTS patch release label Nov 23, 2016
@PSUdaemon PSUdaemon added this to the 6.2.1 milestone Nov 23, 2016
@PSUdaemon PSUdaemon self-assigned this Nov 23, 2016
@PSUdaemon PSUdaemon added the HTTP label Nov 28, 2016
@PSUdaemon
Copy link
Copy Markdown
Contributor

[approve ci]

@shinrich can you give this a look over and check to see if you think it looks ok as a backport?

Thanks.

@atsci
Copy link
Copy Markdown

atsci commented Nov 28, 2016

FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/1221/ for details.

@atsci
Copy link
Copy Markdown

atsci commented Nov 28, 2016

Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/1114/ for details.

{
bool inbound_transparent_p = s->state_machine->ua_session->get_netvc()->get_is_transparent();
NetVConnection *vc = s->state_machine->ua_session->get_netvc();
bool inbound_transparent_p = vc->get_is_transparent();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change isn't going to protect from a NULL vc dereference. I just double checked through and it is the change that was made on the master branch, so the backport is consistent.

@shinrich
Copy link
Copy Markdown
Member

Looks good to me. One minor comment, but it was an issue with the original change. So I think the backport is good to go.

@PSUdaemon PSUdaemon merged commit 5bb13f7 into apache:6.2.x Nov 28, 2016
@sekimura sekimura deleted the ts-4938-backport branch December 1, 2016 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Backport Marked for backport for an LTS patch release HTTP

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants