qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 01:44:40 -07:00
Code Releases Activity

image/jpeg: ignore an incorrect but harmless trailing restart marker.

Browse Source 
Fixes #4084.

R=r
CC=golang-dev
https://golang.org/cl/6526043
This commit is contained in:
Nigel Tao 2012-09-18 21:57:33 +10:00
parent 6e4d24999f
commit 648c9eb0b5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pkg/image/jpeg/reader.go
View File

@ -403,6 +403,15 @@ func (d *decoder) decode(r io.Reader, configOnly bool) (image.Image, error) {
if marker == eoiMarker { // End Of Image. if marker == eoiMarker { // End Of Image.
break break
} }
if rst0Marker <= marker && marker <= rst7Marker {
// Figures B.2 and B.16 of the specification suggest that restart markers should
// only occur between Entropy Coded Segments and not after the final ECS.
// However, some encoders may generate incorrect JPEGs with a final restart
// marker. That restart marker will be seen here instead of inside the processSOS
// method, and is ignored as a harmless error. Restart markers have no extra data,
// so we check for this before we read the 16-bit length of the segment.
continue
}
// Read the 16-bit length of the segment. The value includes the 2 bytes for the // Read the 16-bit length of the segment. The value includes the 2 bytes for the
// length itself, so we subtract 2 to get the number of remaining bytes. // length itself, so we subtract 2 to get the number of remaining bytes.
@ -431,7 +440,7 @@ func (d *decoder) decode(r io.Reader, configOnly bool) (image.Image, error) {
err = d.processSOS(n) err = d.processSOS(n)
case marker == driMarker: // Define Restart Interval. case marker == driMarker: // Define Restart Interval.
err = d.processDRI(n) err = d.processDRI(n)
case marker >= app0Marker && marker <= app15Marker || marker == comMarker: // APPlication specific, or COMment. case app0Marker <= marker && marker <= app15Marker || marker == comMarker: // APPlication specific, or COMment.
err = d.ignore(n) err = d.ignore(n)
default: default:
err = UnsupportedError("unknown marker") err = UnsupportedError("unknown marker")