Skip to content

Protect TSActionCancel from null INKContInternal actions #7128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 1 commit into from
Aug 26, 2020
Merged

Protect TSActionCancel from null INKContInternal actions #7128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/traffic_server/InkAPI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6820,11 +6820,20 @@ TSActionCancel(TSAction actionp)
Action *thisaction;
INKContInternal *i;

// Nothing to cancel
if (actionp == nullptr) {
return;
}

/* This is a hack. Should be handled in ink_types */
if ((uintptr_t)actionp & 0x1) {
thisaction = (Action *)((uintptr_t)actionp - 1);
i = (INKContInternal *)thisaction->continuation;
i->handle_event_count(EVENT_IMMEDIATE);
if (thisaction) {
i = (INKContInternal *)thisaction->continuation;
i->handle_event_count(EVENT_IMMEDIATE);
} else { // The action pointer for an INKContInternal was effectively null, just go away
return;
}
} else {
thisaction = (Action *)actionp;
}
Expand Down