From mboxrd@z Thu Jan  1 00:00:00 1970
Message-ID: <6a794eca8e2b9a252883671a05ed6344@quanstro.net>
From: erik quanstrom <quanstro@quanstro.net>
Date: Mon, 14 Sep 2009 21:49:03 -0400
To: 9fans@9fans.net
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Subject: [9fans] jpg bugfix
Topicbox-Message-UUID: 6eb9c49e-ead5-11e9-9d60-3106f5b1d025

this fixes a bug triggered by steve's bug report.

; diffy -c readjpg.c
/n/dump/2009/0914/sys/src/cmd/jpg/readjpg.c:441,453 - readjpg.c:441,452
  	uchar tmp[2];

  	m = marker(h);
- 	switch(m){
- 	case EOI:
+ 	if(m == EOI || (m&~7) == RST){
  		*markerp = m;
  		return 0;
- 	case 0:
- 		jpgerror(h, "ReadJPG: expecting marker; saw %.2x at offset %lld", m, Boffset(h->fd));
  	}
+ 	if(m == 0)
+ 		jpgerror(h, "ReadJPG: expecting marker; saw %.2x at offset %lld", m, Boffset(h->fd));
  	if(Bread(h->fd, tmp, 2) != 2)
      Readerr:
  		jpgerror(h, readerr);

- erik