Skip to content

Commit

Permalink
Merge pull request #5149 from wiredfool/gif_write_oob_read
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk authored Jan 2, 2021
2 parents 01cad6b + 250e42f commit 07bbc46
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Tests/test_file_gif.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ def test_bilevel(optimize):
im.save(test_file, "GIF", optimize=optimize)
return len(test_file.getvalue())

assert test_grayscale(0) == 800
assert test_grayscale(1) == 44
assert test_bilevel(0) == 800
assert test_bilevel(1) == 800
assert test_grayscale(0) == 799
assert test_grayscale(1) == 43
assert test_bilevel(0) == 799
assert test_bilevel(1) == 799


def test_optimize_correctness():
Expand Down
9 changes: 7 additions & 2 deletions src/libImaging/GifEncode.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,13 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
}

}

this = state->buffer[state->x++];
/* Potential special case for xsize==1 */
if (state->x < state->xsize) {
this = state->buffer[state->x++];
} else {
EMIT_RUN(label0);
break;
}

if (this == context->last) {
context->count++;
Expand Down

0 comments on commit 07bbc46

Please sign in to comment.