diff options
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/bzip2/ftbzip2.c')
-rw-r--r-- | Build/source/libs/freetype2/freetype-src/src/bzip2/ftbzip2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/bzip2/ftbzip2.c b/Build/source/libs/freetype2/freetype-src/src/bzip2/ftbzip2.c index 3df7496a6ef..296cea088b6 100644 --- a/Build/source/libs/freetype2/freetype-src/src/bzip2/ftbzip2.c +++ b/Build/source/libs/freetype2/freetype-src/src/bzip2/ftbzip2.c @@ -70,7 +70,7 @@ FT_Pointer p = NULL; - (void)FT_QALLOC( p, sz ); + FT_MEM_QALLOC( p, sz ); return p; } @@ -327,12 +327,13 @@ FT_ULong count ) { FT_Error error = FT_Err_Ok; - FT_ULong delta; for (;;) { - delta = (FT_ULong)( zip->limit - zip->cursor ); + FT_ULong delta = (FT_ULong)( zip->limit - zip->cursor ); + + if ( delta >= count ) delta = count; @@ -494,7 +495,7 @@ stream->size = 0x7FFFFFFFL; /* don't know the real size! */ stream->pos = 0; - stream->base = 0; + stream->base = NULL; stream->read = ft_bzip2_stream_io; stream->close = ft_bzip2_stream_close; |