diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-19 12:36:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-19 12:36:35 (GMT) |
| commit | b8205bd9dc0288f66f1c23e9f227e703bc6712bd (patch) | |
| tree | c4666ea1ed753648647cea39a5af06c290d814b0 /src | |
| parent | 4c5a7f63305b3faeebfa522898e6f9a711f62251 (diff) | |
| parent | 9ae6f2f9a57f0c3096d5785913e437953fa6775c (diff) | |
| download | Qt-b8205bd9dc0288f66f1c23e9f227e703bc6712bd.zip Qt-b8205bd9dc0288f66f1c23e9f227e703bc6712bd.tar.gz Qt-b8205bd9dc0288f66f1c23e9f227e703bc6712bd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Check for buffer overflow in Lookup_MarkMarkPos
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-gpos.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c index a216005..7bd3b3b 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c @@ -3012,6 +3012,9 @@ static HB_Error Lookup_MarkMarkPos( GPOS_Instance* gpi, j--; } + if ( i > buffer->in_pos ) + return HB_Err_Not_Covered; + error = _HB_OPEN_Coverage_Index( &mmp->Mark2Coverage, IN_GLYPH( j ), &mark2_index ); if ( error ) |