From c2013e8a35107f13dcab14671be199f5a3375508 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 28 Feb 2014 15:18:35 +1100 Subject: [PATCH] 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 --- src/pkg/image/jpeg/huffman.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pkg/image/jpeg/huffman.go b/src/pkg/image/jpeg/huffman.go index 9b731fdc4f..f53d873a53 100644 --- a/src/pkg/image/jpeg/huffman.go +++ b/src/pkg/image/jpeg/huffman.go @@ -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 { -- 2.48.1