zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-11 21:10:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added initialization for line and sector portals

Browse source 
Resizing of portal arrays during serialization could lead to processing of junk data

https://forum.zdoom.org/viewtopic.php?t=67494

# Conflicts:
#	src/maploader/specials.cpp
#	src/portal.cpp

# Conflicts:
#	src/portal.h
This commit is contained in:
alexey.lysiuk 2020-08-22 10:57:13 +03:00 committed by drfrag
parent 36210acc28
commit 643cba776b
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/portal.cpp
View file

@ -274,7 +274,6 @@ void P_SpawnLinePortal(line_t* line)
line->portalindex = linePortals.Reserve(1); line->portalindex = linePortals.Reserve(1);
FLinePortal *port = &linePortals.Last(); FLinePortal *port = &linePortals.Last();
memset(port, 0, sizeof(FLinePortal));
port->mOrigin = line; port->mOrigin = line;
port->mDestination = dst; port->mDestination = dst;
port->mType = uint8_t(line->args[2]); // range check is done above. port->mType = uint8_t(line->args[2]); // range check is done above.
@ -669,7 +668,6 @@ unsigned P_GetSkyboxPortal(AActor *actor)
if (level.sectorPortals[i].mSkybox == actor) return i; if (level.sectorPortals[i].mSkybox == actor) return i;
} }
unsigned i = level.sectorPortals.Reserve(1); unsigned i = level.sectorPortals.Reserve(1);
memset(&level.sectorPortals[i], 0, sizeof(level.sectorPortals[i]));
level.sectorPortals[i].mType = PORTS_SKYVIEWPOINT; level.sectorPortals[i].mType = PORTS_SKYVIEWPOINT;
level.sectorPortals[i].mFlags = actor->GetClass()->IsDescendantOf("SkyCamCompat") ? 0 : PORTSF_SKYFLATONLY; level.sectorPortals[i].mFlags = actor->GetClass()->IsDescendantOf("SkyCamCompat") ? 0 : PORTSF_SKYFLATONLY;
level.sectorPortals[i].mSkybox = actor; level.sectorPortals[i].mSkybox = actor;
@ -694,7 +692,6 @@ DEFINE_ACTION_FUNCTION(FSectorPortal, GetSkyboxPortal)
unsigned P_GetPortal(int type, int plane, sector_t *from, sector_t *to, const DVector2 &displacement) unsigned P_GetPortal(int type, int plane, sector_t *from, sector_t *to, const DVector2 &displacement)
{ {
unsigned i = level.sectorPortals.Reserve(1); unsigned i = level.sectorPortals.Reserve(1);
memset(&level.sectorPortals[i], 0, sizeof(level.sectorPortals[i]));
level.sectorPortals[i].mType = type; level.sectorPortals[i].mType = type;
level.sectorPortals[i].mPlane = plane; level.sectorPortals[i].mPlane = plane;
level.sectorPortals[i].mOrigin = from; level.sectorPortals[i].mOrigin = from;
@ -715,7 +712,6 @@ unsigned P_GetPortal(int type, int plane, sector_t *from, sector_t *to, const DV
unsigned P_GetStackPortal(AActor *point, int plane) unsigned P_GetStackPortal(AActor *point, int plane)
{ {
unsigned i = level.sectorPortals.Reserve(1); unsigned i = level.sectorPortals.Reserve(1);
memset(&level.sectorPortals[i], 0, sizeof(level.sectorPortals[i]));
level.sectorPortals[i].mType = PORTS_STACKEDSECTORTHING; level.sectorPortals[i].mType = PORTS_STACKEDSECTORTHING;
level.sectorPortals[i].mPlane = plane; level.sectorPortals[i].mPlane = plane;
level.sectorPortals[i].mOrigin = point->target->Sector; level.sectorPortals[i].mOrigin = point->target->Sector;

10
src/portal.h
View file

@ -191,6 +191,11 @@ struct FLinePortal
double mSinRot; double mSinRot;
double mCosRot; double mCosRot;
portnode_t *lineportal_thinglist; portnode_t *lineportal_thinglist;
FLinePortal()
{
memset(this, 0, sizeof *this);
}
}; };
extern TArray<FLinePortal> linePortals; extern TArray<FLinePortal> linePortals;
@ -229,6 +234,11 @@ struct FSectorPortal
double mPlaneZ; double mPlaneZ;
TObjPtr<AActor*> mSkybox; TObjPtr<AActor*> mSkybox;
FSectorPortal()
{
memset(this, 0, sizeof * this);
}
bool MergeAllowed() const bool MergeAllowed() const
{ {
// For thing based stack sectors and regular skies the portal has no relevance for merging visplanes. // For thing based stack sectors and regular skies the portal has no relevance for merging visplanes.