Skip to content

Fix two potential use-after-frees in monster's refcount code #492

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

Open
josephcsible wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix two potential use-after-frees in monster's refcount code #492

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
18 changes: 11 additions & 7 deletions shmup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,10 @@ struct monster {

void rebasePat(const shiftmatrix& new_pat, cell *tgt);

void remove_reference() {
refs--;
if(!refs) {
if(parent) parent->remove_reference();
delete this;
}
}
void remove_reference();

void set_parent(monster *par) {
if(parent == par) return;
if(parent) parent->remove_reference();
parent = par;
parent->refs++;
Expand Down Expand Up @@ -128,6 +123,15 @@ typedef multimap<cell*, monster*>::iterator mit;

EX vector<monster*> active, nonvirtual, additional;

void monster::remove_reference() {
refs--;
if(!refs) {
if(parent) parent->remove_reference();
nonvirtual.erase(std::remove(nonvirtual.begin(), nonvirtual.end(), this), nonvirtual.end());
delete this;
}
}

cell *findbaseAround(shiftpoint p, cell *around, int maxsteps) {

if(quotient || fake::split()) {
Expand Down