Fix double free caused by CGUITTFont code

sfan5 · sfan5 · commit 0f74c7a977c4 · 2021-02-06T13:34:56.000+01:00
This partially reverts commit 2072afb. fixes #10920
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;

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,6 @@ 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;`
`382`	`381`	`tt_face = face->face;`
`383`	`382`
`384`	`383`	`// Store font metrics.`
`@@ -437,9 +436,6 @@ CGUITTFont::~CGUITTFont()`
`437`	`436`	`// Drop our driver now.`
`438`	`437`	`if (Driver)`
`439`	`438`	`Driver->drop();`
`440`		`-`
`441`		`- // Destroy sguitt_face after clearing c_faces`
`442`		`- delete sguitt_face;`
`443`	`439`	`}`
`444`	`440`
`445`	`441`	`void CGUITTFont::reset_images()`