[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master f96094e: [truetype] Fix commit from 2015-10-10.
From: |
Werner LEMBERG |
Subject: |
[freetype2] master f96094e: [truetype] Fix commit from 2015-10-10. |
Date: |
Tue, 13 Oct 2015 05:14:49 +0000 |
branch: master
commit f96094eef0541af5fa09c4a3fed61ac143de8121
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[truetype] Fix commit from 2015-10-10.
* src/truetype/ttgxvar.c (ft_var_load_gvar): Add missing error
handling body to condition.
---
ChangeLog | 7 +++++++
src/truetype/ttgxvar.c | 5 +++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b02735f..73a717b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-13 Werner Lemberg <address@hidden>
+
+ [truetype] Fix commit from 2015-10-10.
+
+ * src/truetype/ttgxvar.c (ft_var_load_gvar): Add missing error
+ handling body to condition.
+
2015-10-12 Werner Lemberg <address@hidden>
[unix] Make MKDIR_P actually work.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index b8ff141..31954e2 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -489,6 +489,11 @@
/* and a single variation needs at least 4 bytes per glyph */
if ( (FT_ULong)gvar_head.glyphCount *
( ( gvar_head.flags & 1 ) ? 8 : 6 ) > table_len )
+ {
+ FT_TRACE1(( "ft_var_load_gvar: invalid number of glyphs\n" ));
+ error = FT_THROW( Invalid_Table );
+ goto Exit;
+ }
FT_TRACE2(( "loaded\n" ));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master f96094e: [truetype] Fix commit from 2015-10-10.,
Werner LEMBERG <=