mirror of
				https://github.com/luanti-org/luanti.git
				synced 2025-11-04 01:05:48 +01:00 
			
		
		
		
	Fix double free caused by CGUITTFont code
This partially reverts commit 2072afb72b.
fixes #10920
			
			
This commit is contained in:
		@@ -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()
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user