From 4ebc890e0658b8b9c13795559e142b255781aeb5 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 13 Apr 2008 22:06:12 +0000 Subject: [PATCH] * src/pcf/pcfdrivr.c (PCF_Face_Init): Protect call to `FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZ'. From Savannah bug #22909. --- ChangeLog | 6 ++++++ src/pcf/pcfdrivr.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f1d1f172f..26bca16a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-14 Werner Lemberg + + * src/pcf/pcfdrivr.c (PCF_Face_Init): Protect call to + `FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZ'. From Savannah + bug #22909. + 2008-04-13 Werner Lemberg * src/psaux/psconv.c (PS_Conv_ToFixed): Increase precision if diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c index 9cd330d73..0fea30e8c 100644 --- a/src/pcf/pcfdrivr.c +++ b/src/pcf/pcfdrivr.c @@ -2,7 +2,7 @@ FreeType font driver for pcf files - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007 by + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy @@ -273,6 +273,7 @@ THE SOFTWARE. error = error2; if ( error ) +#ifdef FT_CONFIG_OPTION_USE_LZW { FT_Error error3; @@ -295,6 +296,9 @@ THE SOFTWARE. if ( error ) goto Fail; } +#else + goto Fail; +#endif else { face->gzip_source = stream;