From a7a2f55f8462718a425df548945c5445abd32bc5 Mon Sep 17 00:00:00 2001 From: woglinde Date: Fri, 20 Jan 2012 21:32:30 +0000 Subject: [PATCH] Fix:core:When destroying the graphics, destroy the graphics_gc's too, guard graphics_destroy_gc against null pointer git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4900 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/graphics.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/navit/navit/graphics.c b/navit/navit/graphics.c index 165d02d..2040e72 100644 --- a/navit/navit/graphics.c +++ b/navit/navit/graphics.c @@ -402,6 +402,9 @@ void graphics_free(struct graphics *gra) { if (!gra) return; + graphics_gc_destroy(gra->gc[0]); + graphics_gc_destroy(gra->gc[1]); + graphics_gc_destroy(gra->gc[2]); gra->meth.graphics_destroy(gra->priv); g_free(gra->default_font); graphics_font_destroy_all(gra); @@ -449,6 +452,8 @@ struct graphics_gc * graphics_gc_new(struct graphics *gra) */ void graphics_gc_destroy(struct graphics_gc *gc) { + if (!gc) + return; gc->meth.gc_destroy(gc->priv); g_free(gc); } -- 2.7.4