forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

maybe fix issue #331 by allowing harmlesss restarts before the end of image

This commit is contained in:
Adam D. Ruppe 2022-06-14 20:28:48 -04:00
parent 158ce8e21d
commit f38b1ff401
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jpeg.d
View File

@ -1329,7 +1329,7 @@ private:
// Process markers. Returns when an SOFx, SOI, EOI, or SOS marker is // Process markers. Returns when an SOFx, SOI, EOI, or SOS marker is
// encountered. // encountered.
int process_markers () { int process_markers (bool allow_restarts = false) {
int c; int c;
for ( ; ; ) { for ( ; ; ) {
@ -1370,7 +1370,6 @@ private:
break; break;
//case M_APP0: /* no need to read the JFIF marker */ //case M_APP0: /* no need to read the JFIF marker */
case M_JPG:
case M_RST0: /* no parameters */ case M_RST0: /* no parameters */
case M_RST1: case M_RST1:
case M_RST2: case M_RST2:
@ -1379,6 +1378,11 @@ private:
case M_RST5: case M_RST5:
case M_RST6: case M_RST6:
case M_RST7: case M_RST7:
if(allow_restarts)
continue;
else
goto case;
case M_JPG:
case M_TEM: case M_TEM:
stop_decoding(JPGD_UNEXPECTED_MARKER); stop_decoding(JPGD_UNEXPECTED_MARKER);
break; break;
@ -1387,6 +1391,8 @@ private:
break; break;
} }
} }
assert(0);
} }
// Finds the start of image (SOI) marker. // Finds the start of image (SOI) marker.
@ -2222,7 +2228,7 @@ private:
get_bits(16); get_bits(16);
// The next marker _should_ be EOI // The next marker _should_ be EOI
process_markers(); process_markers(true); // but restarts are allowed as we can harmlessly skip them at the end of the stream
} }
m_total_bytes_read -= m_in_buf_left; m_total_bytes_read -= m_in_buf_left;