From dabf0535a8858458704dbdfa5c128265e88e48f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzuki=2C=20Toshiya=20=28=E9=88=B4=E6=9C=A8=E4=BF=8A?= =?UTF-8?q?=E5=93=89=29?= Date: Thu, 22 Mar 2007 05:23:53 +0000 Subject: [PATCH] Temporal fix for 32bit unsigned long overflow on LP64 platform --- ChangeLog | 7 +++++++ builds/unix/ftsystem.c | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aa8b07e1a..58c9ddfbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-03-22 suzuki toshiya + + * builds/unix/ftsystem.c (FT_Stream_Open): Temporal fix to prevent + 32bit unsigned long overflow by 64bit filesize on LP64 platform, + proposed by Sean McBride: + http://lists.gnu.org/archive/html/freetype-devel/2007-03/msg00032.html + 2007-03-22 suzuki toshiya * builds/unix/ftconfig.in: Suppress SGI compiler's warning against diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index c46b1c0b7..79a30d3fb 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -266,7 +266,21 @@ goto Fail_Map; } - stream->size = stat_buf.st_size; + /* XXX: TODO -- real 64bit platform support */ + /* stream->size is typed to unsigned long (freetype/ftsystem.h) */ + /* stat_buf.st_size is usually typed to off_t (sys/stat.h) */ + /* On some platforms, the former is 32bit and the latter is 64bit. */ + /* To avoid overflow caused by font in huge file larger than 2G, */ + /* do a test. Temporal fix proposed by Sean McBride */ + /* */ + if ( stat_buf.st_size > ULONG_MAX ) + { + FT_ERROR(( "FT_Stream_Open: file is too big" )); + goto Fail_Map; + } + + /* This cast potentially truncates a 64bit to 32bit! */ + stream->size = (unsigned long)stat_buf.st_size; stream->pos = 0; stream->base = (unsigned char *)mmap( NULL, stream->size,