Skip to content

Fix "did not get expected restart marker" error #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
treeform merged 4 commits into from
Nov 24, 2024
Merged

Fix "did not get expected restart marker" error #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b24a740
Add failing test jpeg for 'expected restart marker'
iffy Oct 12, 2022
34b1be1
Fix #503 - did not get expected restart marker
iffy Oct 13, 2022
327765f
Remove forgotten debug
iffy Oct 13, 2022
0a0a5fa
make it just a constant and comment.
treeform Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/pixie/fileformats/jpeg.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,9 @@ proc checkRestart(state: var DecoderState) =
if state.todoBeforeRestart <= 0:
if state.pos + 1 > state.len:
failInvalid()
# Handle getting a restart marker right at the end.
if state.buffer[state.pos] == 0xFF and state.buffer[state.pos+1] == 0xD9:
return
if state.buffer[state.pos] != 0xFF or
state.buffer[state.pos + 1] notin {0xD0 .. 0xD7}:
failInvalid("did not get expected restart marker")
Expand Down
Binary file added tests/fileformats/jpeg/masters/restartmarker.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions tests/jpegsuite.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ const jpegSuiteFiles* = [
"tests/fileformats/jpeg/masters/f6-exif.jpg",
"tests/fileformats/jpeg/masters/f7-exif.jpg",
"tests/fileformats/jpeg/masters/f8-exif.jpg",

"tests/fileformats/jpeg/masters/restartmarker.jpg",
]
Loading