Fix memory leak detected by address sanitizer (#10896)

Adriankhl · web-flow · commit 2072afb72b4b · 2021-02-02T20:56:24.000+01:00
diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
@@ -153,7 +153,7 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
 RenderingEngine::~RenderingEngine()
 {
 	core.reset();
-	m_device->drop();
+	m_device->closeDevice();
 	s_singleton = nullptr;
 }
 
diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
@@ -75,8 +75,6 @@ video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id)
 	if (name.empty())
 		return NULL;
 
-	m_to_delete.insert(name);
-
 #if ENABLE_GLES
 	video::ITexture *retval = m_driver->findTexture(name.c_str());
 	if (retval)
@@ -88,6 +86,7 @@ video::ITexture *MenuTextureSource::getTexture(const std::string &name, u32 *id)
 
 	image = Align2Npot2(image, m_driver);
 	retval = m_driver->addTexture(name.c_str(), image);
+	m_to_delete.insert(name);
 	image->drop();
 	return retval;
 #else
diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp
@@ -378,6 +378,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
 	}
 
 	// Store our face.
+	sguitt_face = face;
 	tt_face = face->face;
 
 	// Store font metrics.
@@ -436,6 +437,9 @@ CGUITTFont::~CGUITTFont()
 	// Drop our driver now.
 	if (Driver)
 		Driver->drop();
+
+	// Destroy sguitt_face after clearing c_faces
+	delete sguitt_face;
 }
 
 void CGUITTFont::reset_images()
diff --git a/src/irrlicht_changes/CGUITTFont.h b/src/irrlicht_changes/CGUITTFont.h
@@ -375,6 +375,7 @@ namespace gui
 			gui::IGUIEnvironment* Environment;
 			video::IVideoDriver* Driver;
 			io::path filename;
+			SGUITTFace* sguitt_face = nullptr;
 			FT_Face tt_face;
 			FT_Size_Metrics font_metrics;
 			FT_Int32 load_flags;

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)`
`153`	`153`	`RenderingEngine::~RenderingEngine()`
`154`	`154`	`{`
`155`	`155`	`core.reset();`
`156`		`- m_device->drop();`
	`156`	`+ m_device->closeDevice();`
`157`	`157`	`s_singleton = nullptr;`
`158`	`158`	`}`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`// Store our face.`
	`381`	`+ sguitt_face = face;`
`381`	`382`	`tt_face = face->face;`
`382`	`383`
`383`	`384`	`// Store font metrics.`
`@@ -436,6 +437,9 @@ CGUITTFont::~CGUITTFont()`
`436`	`437`	`// Drop our driver now.`
`437`	`438`	`if (Driver)`
`438`	`439`	`Driver->drop();`
	`440`	`+`
	`441`	`+ // Destroy sguitt_face after clearing c_faces`
	`442`	`+ delete sguitt_face;`
`439`	`443`	`}`
`440`	`444`
`441`	`445`	`void CGUITTFont::reset_images()`