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

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

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.

[nigeltao, 2012-05-04 08:14:14]

Hello bradfitz@golang.org (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/freetype-go

[bradfitz, 2012-05-04 08:21:15]

LGTM

On Fri, May 4, 2012 at 6:14 PM, <nigeltao@golang.org> wrote:

> Reviewers: bradfitz,
>
> Message:
> Hello bradfitz@golang.org (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
>
https://code.google.com/p/**freetype-go<https://code.google.com/p/freetype-go>
>
>
> Description:
> freetype: remove arbitrary 1<<24 limit on ttf file size.
>
> 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.
>
> Please review this at
http://codereview.appspot.com/**6201043/<http://codereview.appspot.com/6201043/>
>
> Affected files:
>  M freetype/truetype/truetype.go
>
>
> Index: freetype/truetype/truetype.go
> ==============================**==============================**=======
> --- a/freetype/truetype/truetype.**go
> +++ b/freetype/truetype/truetype.**go
> @@ -80,14 +80,18 @@
>  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 (
>
>
>

[nigeltao, 2012-05-06 23:37:53]

*** Submitted as
http://code.google.com/p/freetype-go/source/detail?r=4ae66bdadf6f ***

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

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