From 64b3e590c00b9c1e532dd0014b16174c9397664c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 8 Nov 2012 10:36:29 +1100 Subject: [PATCH] image/jpeg: handle fill bytes. Fixes #4337. R=r, minux.ma CC=golang-dev https://golang.org/cl/6814098 --- src/pkg/image/jpeg/reader.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pkg/image/jpeg/reader.go b/src/pkg/image/jpeg/reader.go index 5b1e61774e..24dd65defc 100644 --- a/src/pkg/image/jpeg/reader.go +++ b/src/pkg/image/jpeg/reader.go @@ -236,6 +236,14 @@ func (d *decoder) decode(r io.Reader, configOnly bool) (image.Image, error) { return nil, FormatError("missing 0xff marker start") } marker := d.tmp[1] + for marker == 0xff { + // Section B.1.1.2 says, "Any marker may optionally be preceded by any + // number of fill bytes, which are bytes assigned code X'FF'". + marker, err = d.r.ReadByte() + if err != nil { + return nil, err + } + } if marker == eoiMarker { // End Of Image. break } -- 2.48.1