From c39978104b549556869566cd0aa99401f765121f Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Sun, 21 Mar 2004 23:45:10 +0000 Subject: revert and really fix the leak, at last... CVS patchset: 6297 CVS date: 2004/03/21 23:45:10 --- src/xine-engine/osd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 7a27ccb7d..1fb6ef915 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -617,6 +617,7 @@ static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { known_font->num_fontchars = font->num_fontchars; known_font->loaded = 1; known_font->fontchar = font->fontchar; + free(font); } else { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("font '%s-%d' already loaded, weird.\n"), font->name, font->size); @@ -695,8 +696,7 @@ static int osd_renderer_unload_font(osd_renderer_t *this, char *fontname ) { } last = font; - free(font); - font = last->next; + font = font->next; } pthread_mutex_unlock (&this->osd_mutex); @@ -1280,7 +1280,7 @@ static void osd_renderer_close (osd_renderer_t *this) { while( this->osds ) osd_free_object ( this->osds ); - + while( this->fonts ) osd_renderer_unload_font( this, this->fonts->name ); -- cgit v1.2.3