Fix double free caused by CGUITTFont code

This partially reverts commit 2072afb. fixes #10920
minetest · Feb 6, 2021 · 0f74c7a · 0f74c7a
1 parent d287da1
commit 0f74c7a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp
@@ -378,7 +378,6 @@ 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.
@@ -437,9 +436,6 @@ 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,7 +375,6 @@ 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;