OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fix some crashes in the Shape2D VBO code due to unsound pointer usage (#1318)

Browse source
This commit is contained in:
Gutawer 2021-02-25 15:49:41 +00:00 • committed by GitHub
commit 73dc528112
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/common/2d/v_2ddrawer.cpp
View file

@ -565,7 +565,7 @@ void F2DDrawer::AddShape(FGameTexture* img, DShape2D* shape, DrawParms& parms)
if (!shape->uploadedOnce) {
shape->bufIndex = -1;
shape->buffers.Clear();
shape->lastCommand = nullptr;
shape->lastCommand = -1;
}
delete shape->lastParms;
shape->lastParms = new DrawParms(parms);
@ -647,12 +647,9 @@ void F2DDrawer::AddShape(FGameTexture* img, DShape2D* shape, DrawParms& parms)
shape->uploadedOnce = true;
}
dg.shape2DBufIndex = shape->bufIndex;
dg.shapeLastCmd = true;
if (shape->lastCommand != nullptr) {
shape->lastCommand->shapeLastCmd = false;
}
auto c = AddCommand(&dg);
shape->lastCommand = &mData[c];
shape->lastCommand += 1;
dg.shape2DCommandCounter = shape->lastCommand;
AddCommand(&dg);
offset = osave;
}