From 55c40631f482aef472b2e754941d76ca8dff475b Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 18 Sep 2008 11:20:12 +0000 Subject: [PATCH] * src/base/ftsystem.c (FT_Done_Memory): Use ft_sfree directly for orthogonality (ft_free and ft_sfree could belong to different memory pools). This fixes Savannah bug #24297. --- ChangeLog | 6 ++++++ src/base/ftsystem.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee5b9253a..86aaf3481 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-18 Werner Lemberg + + * src/base/ftsystem.c (FT_Done_Memory): Use ft_sfree directly for + orthogonality (ft_free and ft_sfree could belong to different memory + pools). This fixes Savannah bug #24297. + 2008-09-18 suzuki toshiya * src/cff/cffobjs.c (cff_face_init): Use TTAG_OTTO defined diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c index f61a3edfb..f64908fd2 100644 --- a/src/base/ftsystem.c +++ b/src/base/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* ANSI-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2001, 2002, 2006 by */ +/* Copyright 1996-2001, 2002, 2006, 2008 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -294,7 +294,7 @@ #ifdef FT_DEBUG_MEMORY ft_mem_debug_done( memory ); #endif - memory->free( memory, memory ); + ft_sfree( memory ); }