[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] GSoC-2019-nikhil f67786d: [woff2] Check whether known tag is
From: |
Nikhil Ramakrishnan |
Subject: |
[freetype2] GSoC-2019-nikhil f67786d: [woff2] Check whether known tag is in array bounds. |
Date: |
Thu, 22 Aug 2019 07:18:59 -0400 (EDT) |
branch: GSoC-2019-nikhil
commit f67786de4d52c972e68bcb07252ab3229996cb83
Author: Nikhil Ramakrishnan <address@hidden>
Commit: Nikhil Ramakrishnan <address@hidden>
[woff2] Check whether known tag is in array bounds.
If table tag is not 0x3f, we expect a value between 0 and 62. If this is
not the case, exit with errors.
* src/sfnt/sfwoff2/c: Check whether table tag makes sense.
* src/sfnt/woff2tags.c: Return 0 if tag is out of bounds.
---
src/sfnt/sfwoff2.c | 12 ++++++++++--
src/sfnt/woff2tags.c | 3 +++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c
index dbe6a62..9099b43 100644
--- a/src/sfnt/sfwoff2.c
+++ b/src/sfnt/sfwoff2.c
@@ -1760,7 +1760,15 @@
goto Exit;
}
else
+ {
table->Tag = woff2_known_tags( table->FlagByte & 0x3f );
+ if ( !table->Tag )
+ {
+ FT_ERROR(( "woff2_open_font: Unknown table tag." ));
+ error = FT_THROW( Invalid_Table );
+ goto Exit;
+ }
+ }
flags = 0;
xform_version = ( table->FlagByte >> 6 ) & 0x03;
@@ -1787,7 +1795,7 @@
goto Exit;
if ( table->Tag == TTAG_loca && table->TransformLength )
{
- FT_ERROR(( "woff_font_open: Invalid loca `transformLength'.\n" ));
+ FT_ERROR(( "woff2_open_font: Invalid loca `transformLength'.\n" ));
error = FT_THROW( Invalid_Table );
goto Exit;
}
@@ -1795,7 +1803,7 @@
if ( src_offset + table->TransformLength < src_offset )
{
- FT_ERROR(( "woff_font_open: invalid WOFF2 table directory.\n" ));
+ FT_ERROR(( "woff2_open_font: invalid WOFF2 table directory.\n" ));
error = FT_THROW( Invalid_Table );
goto Exit;
}
diff --git a/src/sfnt/woff2tags.c b/src/sfnt/woff2tags.c
index 5b274d5..45ef3fa 100644
--- a/src/sfnt/woff2tags.c
+++ b/src/sfnt/woff2tags.c
@@ -91,6 +91,9 @@
};
+ if ( index < 0 || index > 62 )
+ return 0;
+
return known_tags[index];
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] GSoC-2019-nikhil f67786d: [woff2] Check whether known tag is in array bounds.,
Nikhil Ramakrishnan <=