matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add safeguard to try_move to ensure we don't write to out of bounds pmap

Browse Source 
This is a follow up to this crash fix - 0ed8d0a0be
This may possibly fix other crashes users occasionally experience, especially in the case of high velocity particles with loop edge mode on. Even so, there are other bugs at play, as a crash here can't be triggered if pmap is in a correct state
This commit is contained in:
jacob1 2022-02-21 23:20:43 -05:00
parent 656ace10c6
commit 982fdff528
No known key found for this signature in database
GPG Key ID: 4E58A32D510E1995
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulation/Simulation.cpp
View File

@ -2863,9 +2863,14 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
if (ID(pmap[ny][nx]) == ri) if (ID(pmap[ny][nx]) == ri)
pmap[ny][nx] = 0; pmap[ny][nx] = 0;
parts[ri].x += float(x-nx); parts[ri].x += float(x - nx);
parts[ri].y += float(y-ny); parts[ri].y += float(y - ny);
pmap[(int)(parts[ri].y+0.5f)][(int)(parts[ri].x+0.5f)] = PMAP(ri, parts[ri].type); int rx = int(parts[ri].x + 0.5f);
int ry = int(parts[ri].y + 0.5f);
// This check will never fail unless the pmap array has already been corrupted via another bug
// In that case, r's position is inaccurate (not actually at nx/ny) and rx/ry may be out of bounds
if (InBounds(rx, ry))
pmap[ry][rx] = PMAP(ri, parts[ri].type);
} }
return 1; return 1;
} }