diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-06-09 19:29:03 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-06-09 19:29:03 +0200 |
| commit | ee49e074127d93fccae763baaec3e93b6728ff80 (patch) | |
| tree | 99a277e9a0ed635ffc8aaf8179dcba5ebc0cf9cd /src/sfnt/ttsbit.c | |
| parent | 989b6c878d007b154ca92273b4266686f8dbc315 (diff) | |
| parent | 77f63d23f7d380b0ff02c18fd6a154ab9063128a (diff) | |
| download | android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.tar.gz android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.tar.bz2 android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.zip | |
resolved conflicts for merge 77f63d to master
Diffstat (limited to 'src/sfnt/ttsbit.c')
| -rw-r--r-- | src/sfnt/ttsbit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index 28acde3..eadaade 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -1325,7 +1325,11 @@ range->image_format, metrics, stream ); case 8: /* compound format */ - FT_Stream_Skip( stream, 1L ); + if ( FT_STREAM_SKIP( 1L ) ) + { + error = SFNT_Err_Invalid_Stream_Skip; + goto Exit; + } /* fallthrough */ case 9: |