speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions 5

OsgScenery.cpp: Fix undefined behaviour on delete

Browse source 
SDTrack was taking the ownership for track, a pointer to tTrack
allocated many layers above SDScenery::LoadScene. More specifically, it
is allocated by either TrackBuildEx or TrackBuildv1, and both would
allocate the tTrack instance via calloc(3) instead of C++'s new.

Attempting to `delete` a pointer *not* allocated by a previous call to
`new` is undefined behaviour according to the C++ standard. [1]

In fact, SDScenery::LoadScene did not even attempt to modify the
tTrack instance, so there was no need to take its ownership in the first
place.

[1]: https://en.cppreference.com/w/cpp/language/delete
This commit is contained in:
Xavier Del Campo Romero 2025-01-18 06:52:56 +01:00
parent 853c45a62b
commit 1796f83767
Signed by: xavi
GPG key ID: 84FF3612A9BF43F2
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/modules/graphic/osggraph/Scenery/OsgScenery.cpp
View file

@ -43,8 +43,7 @@ SDScenery::SDScenery(void) :
m_background(NULL), m_background(NULL),
m_pit(NULL), m_pit(NULL),
m_tracklights(NULL), m_tracklights(NULL),
_scenery(NULL), _scenery(NULL)
SDTrack(NULL)
{ {
_max_visibility = 0; _max_visibility = 0;
_nb_cloudlayer = 0; _nb_cloudlayer = 0;
@ -62,15 +61,12 @@ SDScenery::~SDScenery(void)
delete m_background; delete m_background;
delete m_pit; delete m_pit;
delete m_tracklights; delete m_tracklights;
delete SDTrack;
if(_scenery != NULL) if(_scenery != NULL)
{ {
_scenery->removeChildren(0, _scenery->getNumChildren()); _scenery->removeChildren(0, _scenery->getNumChildren());
_scenery = NULL; _scenery = NULL;
} }
SDTrack = NULL;
} }
void SDScenery::LoadScene(tTrack *track) void SDScenery::LoadScene(tTrack *track)
@ -85,7 +81,6 @@ void SDScenery::LoadScene(tTrack *track)
m_pit = new SDPit; m_pit = new SDPit;
m_tracklights = new SDTrackLights; m_tracklights = new SDTrackLights;
_scenery = new osg::Group; _scenery = new osg::Group;
SDTrack = track;
// Load graphics options. // Load graphics options.
LoadGraphicsOptions(); LoadGraphicsOptions();
@ -96,15 +91,15 @@ void SDScenery::LoadScene(tTrack *track)
}//if grHandle }//if grHandle
/* Determine the world limits */ /* Determine the world limits */
grWrldX = (int)(SDTrack->max.x - SDTrack->min.x + 1); grWrldX = (int)(track->max.x - track->min.x + 1);
grWrldY = (int)(SDTrack->max.y - SDTrack->min.y + 1); grWrldY = (int)(track->max.y - track->min.y + 1);
grWrldZ = (int)(SDTrack->max.z - SDTrack->min.z + 1); grWrldZ = (int)(track->max.z - track->min.z + 1);
grWrldMaxSize = (int)(MAX(MAX(grWrldX, grWrldY), grWrldZ)); grWrldMaxSize = (int)(MAX(MAX(grWrldX, grWrldY), grWrldZ));
if (strcmp(SDTrack->category, "speedway") == 0) if (strcmp(track->category, "speedway") == 0)
{ {
_speedWay = true; _speedWay = true;
if (strcmp(SDTrack->subcategory, "long") == 0) if (strcmp(track->subcategory, "long") == 0)
_speedWayLong = true; _speedWayLong = true;
else else
_speedWayLong = false; _speedWayLong = false;
@ -222,8 +217,6 @@ void SDScenery::ShutdownScene(void)
//delete loader; //delete loader;
_scenery->removeChildren(0, _scenery->getNumChildren()); _scenery->removeChildren(0, _scenery->getNumChildren());
_scenery = NULL; _scenery = NULL;
SDTrack = NULL;
} }
bool SDScenery::LoadTrack(std::string& strTrack) bool SDScenery::LoadTrack(std::string& strTrack)