diff options
| author | Nigel Tao <nigeltao@golang.org> | 2015-04-09 11:39:21 +1000 |
|---|---|---|
| committer | Nigel Tao <nigeltao@golang.org> | 2015-04-09 02:32:23 +0000 |
| commit | eb4408291597609c48bf3871a36dd4abdcd5c538 (patch) | |
| tree | 3afe1c6465348981a8b2d8ed49a39a9498509595 /src/image | |
| parent | c844bf4cfc6bd05448b0c60aa01c07034d635384 (diff) | |
| download | go-eb4408291597609c48bf3871a36dd4abdcd5c538.tar.xz | |
image/jpeg: reject multiple Start-Of-Frame markers.
Fixes #10389
Change-Id: Id1c687122751f9317041d9e425d03b267a26c6de
Reviewed-on: https://go-review.googlesource.com/8681
Reviewed-by: Rob Pike <r@golang.org>
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/jpeg/reader.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/image/jpeg/reader.go b/src/image/jpeg/reader.go index 6a86472046..2c3c2f72f8 100644 --- a/src/image/jpeg/reader.go +++ b/src/image/jpeg/reader.go @@ -298,6 +298,9 @@ func (d *decoder) ignore(n int) error { // Specified in section B.2.2. func (d *decoder) processSOF(n int) error { + if d.nComp != 0 { + return FormatError("multiple SOF markers") + } switch n { case 6 + 3*1: // Grayscale image. d.nComp = 1 |