zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-02 00:43:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed usage of uninitialized object in BlockLinesIterator

Browse source 
DBlockLinesIterator::check was used by FMultiBlockLinesIterator before it was constructed

https://forum.zdoom.org/viewtopic.php?t=66224
This commit is contained in:
alexey.lysiuk 2019-10-26 11:01:49 +03:00
parent dfecc1229f
commit fb384c6b8d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/scripting/vmiterators.cpp
View file

@ -92,16 +92,18 @@ DEFINE_ACTION_FUNCTION_NATIVE(DThinkerIterator, Reinit, ReinitThinker)
// //
//=========================================================================== //===========================================================================
class DBlockLinesIterator : public DObject, public FMultiBlockLinesIterator class DBlockLinesIterator : public DObject
{ {
DECLARE_ABSTRACT_CLASS(DBlockLinesIterator, DObject); DECLARE_ABSTRACT_CLASS(DBlockLinesIterator, DObject);
FPortalGroupArray check; FPortalGroupArray check;
public: public:
FMultiBlockLinesIterator iterator;
FMultiBlockLinesIterator::CheckResult cres; FMultiBlockLinesIterator::CheckResult cres;
DBlockLinesIterator(AActor *actor, double checkradius) DBlockLinesIterator(AActor *actor, double checkradius)
: FMultiBlockLinesIterator(check, actor, checkradius) : iterator(check, actor, checkradius)
{ {
cres.line = nullptr; cres.line = nullptr;
cres.Position.Zero(); cres.Position.Zero();
@ -109,7 +111,7 @@ public:
} }
DBlockLinesIterator(double x, double y, double z, double height, double radius, sector_t *sec) DBlockLinesIterator(double x, double y, double z, double height, double radius, sector_t *sec)
:FMultiBlockLinesIterator(check, currentVMLevel, x, y, z, height, radius, sec) : iterator(check, currentVMLevel, x, y, z, height, radius, sec)
{ {
cres.line = nullptr; cres.line = nullptr;
cres.Position.Zero(); cres.Position.Zero();
@ -151,7 +153,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(DBlockLinesIterator, CreateFromPos, CreateBLIFromP
static int BLINext(DBlockLinesIterator *self) static int BLINext(DBlockLinesIterator *self)
{ {
return self->Next(&self->cres); return self->iterator.Next(&self->cres);
} }
DEFINE_ACTION_FUNCTION_NATIVE(DBlockLinesIterator, Next, BLINext) DEFINE_ACTION_FUNCTION_NATIVE(DBlockLinesIterator, Next, BLINext)