aboutsummaryrefslogtreecommitdiff
path: root/freetype/builds/amiga
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-16 19:26:40 +0000
committermarha <marha@users.sourceforge.net>2011-01-16 19:26:40 +0000
commit4e370208d0f941a4cceb6f9fefa78444c2bf3498 (patch)
tree543c693b5dee03c965b0c9ef79869a8536024432 /freetype/builds/amiga
parent1eaf4b3f1d746b054298358d81233364bb1b7ba2 (diff)
parent2177eb8fad173f2b0fe04f188c4d6dadaa8f4441 (diff)
downloadvcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.gz
vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.bz2
vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.zip
svn merge ^/branches/released .
Diffstat (limited to 'freetype/builds/amiga')
-rw-r--r--freetype/builds/amiga/src/base/ftsystem.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/freetype/builds/amiga/src/base/ftsystem.c b/freetype/builds/amiga/src/base/ftsystem.c
index 39c3a28f2..8a60bb704 100644
--- a/freetype/builds/amiga/src/base/ftsystem.c
+++ b/freetype/builds/amiga/src/base/ftsystem.c
@@ -4,7 +4,7 @@
/* */
/* Amiga-specific FreeType low-level system interface (body). */
/* */
-/* Copyright 1996-2001, 2002, 2005, 2006, 2007 by */
+/* Copyright 1996-2001, 2002, 2005, 2006, 2007, 2010 by */
/* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -442,6 +442,14 @@ Free_VecPooled( APTR poolHeader,
stream->read = ft_amiga_stream_io;
stream->close = ft_amiga_stream_close;
+ if ( !stream->size )
+ {
+ ft_amiga_stream_close( stream );
+ FT_ERROR(( "FT_Stream_Open:" ));
+ FT_ERROR(( " opened `%s' but zero-sized\n", filepathname ));
+ return FT_Err_Cannot_Open_Stream;;
+ }
+
FT_TRACE1(( "FT_Stream_Open:" ));
FT_TRACE1(( " opened `%s' (%ld bytes) successfully\n",
filepathname, stream->size ));