mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-03-12 16:19:43 +00:00
Code Issues Releases Wiki Activity

Merge pull request #492 from josephcsible/fixref

Browse Source 
Fix two potential use-after-frees in monster's refcount code
This commit is contained in:
Zeno Rogue
2026-02-22 13:45:54 +01:00
committed by GitHub
parent e709165712 566fc9f76a
commit c0dab04813
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shmup.cpp
View File

@@ -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++;
@@ -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()) {