* builds/unix/ftsystem.c (FT_Stream_Open): Reject zero-length files.
Patch from Savannah bug #25151.
This commit is contained in:
parent
3c5ad95166
commit
66043b1c4f
|
@ -1,3 +1,8 @@
|
||||||
|
2008-12-22 Steve Grubb
|
||||||
|
|
||||||
|
* builds/unix/ftsystem.c (FT_Stream_Open): Reject zero-length files.
|
||||||
|
Patch from Savannah bug #25151.
|
||||||
|
|
||||||
2008-12-21 Werner Lemberg <wl@gnu.org>
|
2008-12-21 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* src/pfr/pfrdrivr.c, src/winfonts/winfnt.c, src/cache/ftcmanag.c,
|
* src/pfr/pfrdrivr.c, src/winfonts/winfnt.c, src/cache/ftcmanag.c,
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* Unix-specific FreeType low-level system interface (body). */
|
/* Unix-specific FreeType low-level system interface (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007 by */
|
/* Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007, 2008 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -280,6 +280,11 @@
|
||||||
FT_ERROR(( "FT_Stream_Open: file is too big" ));
|
FT_ERROR(( "FT_Stream_Open: file is too big" ));
|
||||||
goto Fail_Map;
|
goto Fail_Map;
|
||||||
}
|
}
|
||||||
|
else if ( stat_buf.st_size == 0 )
|
||||||
|
{
|
||||||
|
FT_ERROR(( "FT_Stream_Open: zero-length file" ));
|
||||||
|
goto Fail_Map;
|
||||||
|
}
|
||||||
|
|
||||||
/* This cast potentially truncates a 64bit to 32bit! */
|
/* This cast potentially truncates a 64bit to 32bit! */
|
||||||
stream->size = (unsigned long)stat_buf.st_size;
|
stream->size = (unsigned long)stat_buf.st_size;
|
||||||
|
|
Loading…
Reference in New Issue