mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

image/jpeg: return a FormatError when hitting an unexpected io.EOF 

inside Huffman-encoded data.

Fixes #6450.

LGTM=r
R=r
CC=golang-codereviews
https://golang.org/cl/69830043
This commit is contained in:
Nigel Tao 2014-02-28 15:18:35 +11:00
parent a9600502bb
commit c2013e8a35
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkg/image/jpeg/huffman.go
View File

@ -37,6 +37,9 @@ func (d *decoder) ensureNBits(n int) error {
for d.b.n < n {
c, err := d.r.ReadByte()
if err != nil {
if err == io.EOF {
return FormatError("short Huffman data")
}
return err
}
d.b.a = d.b.a<<8 | uint32(c)
@ -50,6 +53,9 @@ func (d *decoder) ensureNBits(n int) error {
if c == 0xff {
c, err = d.r.ReadByte()
if err != nil {
if err == io.EOF {
return FormatError("short Huffman data")
}
return err
}
if c != 0x00 {