From c776fc17bfeaa607405fc96620e9445e7a0965c3 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 25 Feb 2012 14:21:01 +0100 Subject: [PATCH] [pcf] Fix Savannah bug #35603. * src/pcf/pcfread.c (pcf_get_properties): Assure final zero byte in `strings' array. --- ChangeLog | 7 +++++++ src/pcf/pcfread.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bca0875e..9a98b10f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-02-25 Werner Lemberg + + [pcf] Fix Savannah bug #35603. + + * src/pcf/pcfread.c (pcf_get_properties): Assure final zero byte in + `strings' array. + 2012-02-25 Werner Lemberg [type42] Fix Savannah bug #35602. diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index f8c2a239b..d9914c03a 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -2,8 +2,7 @@ FreeType font driver for pcf fonts - Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010 by + Copyright 2000-2010, 2012 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy @@ -496,7 +495,8 @@ THE SOFTWARE. goto Bail; } - if ( FT_NEW_ARRAY( strings, string_size ) ) + /* allocate one more byte so that we have a final null byte */ + if ( FT_NEW_ARRAY( strings, string_size + 1 ) ) goto Bail; error = FT_Stream_Read( stream, (FT_Byte*)strings, string_size );