diff options
| author | Werner Lemberg <wl@gnu.org> | 2010-08-04 15:54:55 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2010-08-04 15:54:55 +0200 |
| commit | 45a3c76b547511fa9d97aca34b150a0663257375 (patch) | |
| tree | 9514fa7162f8dca57be4075e61ce79f6d0f9ab0f | |
| parent | 32dc43a5cc7b24ba2cdf78991fc49b1c6aeb720d (diff) | |
| download | freetype2-45a3c76b547511fa9d97aca34b150a0663257375.tar.gz | |
Fix Savannah bug #30644.
* src/base/ftstream.c (FT_Stream_EnterFrame): Fix comparison.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/base/ftstream.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2010-08-04 Werner Lemberg <wl@gnu.org> + Fix Savannah bug #30644. + + * src/base/ftstream.c (FT_Stream_EnterFrame): Fix comparison. + +2010-08-04 Werner Lemberg <wl@gnu.org> + `make devel' fails if FT_CONFIG_OPTION_OLD_INTERNALS is set. * devel/ftoption.h: Synchronize with diff --git a/src/base/ftstream.c b/src/base/ftstream.c index 9b087ac..210aaa4 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -287,7 +287,7 @@ { /* check current and new position */ if ( stream->pos >= stream->size || - stream->pos + count > stream->size ) + stream->size - stream->pos < count ) { FT_ERROR(( "FT_Stream_EnterFrame:" " invalid i/o; pos = 0x%lx, count = %lu, size = 0x%lx\n", |
