Clip std/gif replicated rows to the frame rect

Updates https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=17802
This commit is contained in:
Nigel Tao committed 2019-10-05 11:54:03 +10:00
1 parent aaebb17a01
commit 9089d37578
3 files changed
+5 -3

No files matched your search

+2
View File
@@ -11183,6 +11183,8 @@ label_0_continue:;
self->private_impl.f_dst_y,
((uint32_t)(
wuffs_gif__interlace_count[self->private_impl.f_interlace])));
v_replicate_y1 = wuffs_base__u32__min(
v_replicate_y1, self->private_impl.f_frame_rect_y1);
while (v_replicate_y0 < v_replicate_y1) {
v_replicate_dst = wuffs_base__table_u8__row(v_tab, v_replicate_y0);
wuffs_base__slice_u8__copy_from_slice(v_replicate_dst,
+1
View File
@@ -1182,6 +1182,7 @@ pri func decoder.copy_to_image_buffer!(pb ptr base.pixel_buffer, src slice base.
replicate_src = tab.row(y:this.dst_y)
replicate_y0 = this.dst_y ~sat+ 1
replicate_y1 = this.dst_y ~sat+ (interlace_count[this.interlace] as base.u32)
replicate_y1 = replicate_y1.min(a:this.frame_rect_y1)
while replicate_y0 < replicate_y1 {
assert replicate_y0 < 0xFFFFFFFF via "a < b: a < c; c <= b"(c:replicate_y1)
replicate_dst = tab.row(y:replicate_y0)
+2 -3
View File
@@ -2085,9 +2085,8 @@ const char* test_wuffs_gif_small_frame_interlaced() {
}
wuffs_base__rect_ie_u32 dr = wuffs_gif__decoder__frame_dirty_rect(&dec);
// TODO: it's a bug that the frame rect doesn't contain the dirty rect.
if (dr.max_excl_y != 5) {
RETURN_FAIL("dirty rect max_excl_y: got %" PRIu32 ", want 5",
if (dr.max_excl_y != 3) {
RETURN_FAIL("dirty rect max_excl_y: got %" PRIu32 ", want 3",
dr.max_excl_y);
}