From: Nigel Tao <nigeltao@golang.org>
Date: Mon, 2 Mar 2015 03:53:07 +0000 (+1100)
Subject: image/jpeg: when following component selectors, only consider valid
X-Git-Tag: go1.5beta1~1763
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0fe6b1293a9b65bc8b23be41d111bc9e4914684a;p=gostls13.git

image/jpeg: when following component selectors, only consider valid
components.

This fixes decoding JPEG images where the component selector is 0. Such
images are rare, but not impossible.

Change-Id: I6d221bce01cce8cc0440e117543233371782ca22
Reviewed-on: https://go-review.googlesource.com/6421
Reviewed-by: Rob Pike <r@golang.org>
---

diff --git a/src/image/jpeg/scan.go b/src/image/jpeg/scan.go
index 8fcf401dd8..da60023fb5 100644
--- a/src/image/jpeg/scan.go
+++ b/src/image/jpeg/scan.go
@@ -66,7 +66,7 @@ func (d *decoder) processSOS(n int) error {
 	for i := 0; i < nComp; i++ {
 		cs := d.tmp[1+2*i] // Component selector.
 		compIndex := -1
-		for j, comp := range d.comp {
+		for j, comp := range d.comp[:d.nComp] {
 			if cs == comp.c {
 				compIndex = j
 			}