aw/golang-freetype
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freetype: remove arbitrary 1<<24 limit on ttf file size.

Browse Source 
I'm not sure why I put that limit in in the first place. I can't find
that limit in either the C Freetype code or the TTF spec.

R=bradfitz
CC=golang-dev
http://codereview.appspot.com/6201043
This commit is contained in:
Nigel Tao 2012-05-07 09:37:34 +10:00
parent f1ba16952f
commit 9a8fb30c20
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freetype/truetype/truetype.go
View File

@ -80,14 +80,18 @@ func (d *data) skip(n int) {
func readTable(ttf []byte, offsetLength []byte) ([]byte, error) {
d := data(offsetLength)
offset := int(d.u32())
if offset < 0 || offset > 1<<24 || offset > len(ttf) {
return nil, FormatError(fmt.Sprintf("offset too large: %d", offset))
if offset < 0 {
return nil, FormatError(fmt.Sprintf("offset too large: %d", uint32(offset)))
}
length := int(d.u32())
if length < 0 || length > 1<<24 || offset+length > len(ttf) {
return nil, FormatError(fmt.Sprintf("length too large: %d", length))
if length < 0 {
return nil, FormatError(fmt.Sprintf("length too large: %d", uint32(length)))
}
return ttf[offset : offset+length], nil
end := offset + length
if end < 0 || end > len(ttf) {
return nil, FormatError(fmt.Sprintf("offset + length too large: %d", uint32(offset)+uint32(length)))
}
return ttf[offset:end], nil
}
const (