xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

jpg: treat EOF as EOI marker

Browse source 
Some jpegs, rightly or wrongly, do not contain an EOI marker.  This
causes jpg(1) to bail out even after correctly parsing the entire
image.
This commit is contained in:
Alex Musolino 2020-10-31 15:44:49 +10:30
parent 31eb1b9d72
commit 51b22d8548
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/cmd/jpg/readjpg.c
View file

@ -389,8 +389,12 @@ readbyte(Header *h)
if(h->peek >= 0){
x = h->peek;
h->peek = -1;
}else if(Bread(h->fd, &x, 1) != 1)
jpgerror(h, readerr);
}else
switch(Bread(h->fd, &x, 1)){
case 0: return -1;
case 1: break;
default: jpgerror(h, readerr);
}
return x;
}
@ -403,6 +407,8 @@ marker(Header *h)
Again:
while((c=readbyte(h)) == 0)
;
if(c < 0)
return EOI;
if(c != 0xFF)
goto Again;
while(c == 0xFF)