std/xz: tighten VLI (variable length int) decode

This commit is contained in:
Nigel Tao committed 2024-02-15 19:19:46 +11:00
1 parent 4e20ba6876
commit 06599b8e9b
3 files changed
+34 -25

No files matched your search

+18 -12
View File
@@ -68557,16 +68557,19 @@ wuffs_xz__decoder__decode_block_header_sans_padding(
}
if (v_shift <= 56u) {
self->private_impl.f_block_compressed_size |= (((uint64_t)(((uint8_t)(v_c8 & 127u)))) << v_shift);
if (v_c8 < 128u) {
break;
if (v_c8 >= 128u) {
v_shift += 7u;
continue;
} else if ((v_c8 == 0u) && (v_shift > 0u)) {
status = wuffs_base__make_status(wuffs_xz__error__bad_block_header);
goto exit;
}
v_shift += 7u;
continue;
} else if (v_c8 > 1u) {
break;
} else if (v_c8 != 1u) {
status = wuffs_base__make_status(wuffs_xz__error__bad_block_header);
goto exit;
}
self->private_impl.f_block_compressed_size |= (((uint64_t)(v_c8)) << 63u);
self->private_impl.f_block_compressed_size |= (((uint64_t)(1u)) << 63u);
break;
}
}
@@ -68586,16 +68589,19 @@ wuffs_xz__decoder__decode_block_header_sans_padding(
}
if (v_shift <= 56u) {
self->private_impl.f_block_uncompressed_size |= (((uint64_t)(((uint8_t)(v_c8 & 127u)))) << v_shift);
if (v_c8 < 128u) {
break;
if (v_c8 >= 128u) {
v_shift += 7u;
continue;
} else if ((v_c8 == 0u) && (v_shift > 0u)) {
status = wuffs_base__make_status(wuffs_xz__error__bad_block_header);
goto exit;
}
v_shift += 7u;
continue;
} else if (v_c8 > 1u) {
break;
} else if (v_c8 != 1u) {
status = wuffs_base__make_status(wuffs_xz__error__bad_block_header);
goto exit;
}
self->private_impl.f_block_uncompressed_size |= (((uint64_t)(v_c8)) << 63u);
self->private_impl.f_block_uncompressed_size |= (((uint64_t)(1u)) << 63u);
break;
}
}
+16 -12
View File
@@ -349,15 +349,17 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) {
c8 = args.src.read_u8?()
if shift <= 56 {
this.block_compressed_size |= ((c8 & 0x7F) as base.u64) << shift
if c8 < 0x80 {
break
if c8 >= 0x80 {
shift += 7
continue
} else if (c8 == 0x00) and (shift > 0) {
return "#bad block header"
}
shift += 7
continue
} else if c8 > 1 {
break
} else if c8 <> 1 {
return "#bad block header"
}
this.block_compressed_size |= (c8 as base.u64) << 63
this.block_compressed_size |= (1 as base.u64) << 63
break
} endwhile
}
@@ -371,15 +373,17 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) {
c8 = args.src.read_u8?()
if shift <= 56 {
this.block_uncompressed_size |= ((c8 & 0x7F) as base.u64) << shift
if c8 < 0x80 {
break
if c8 >= 0x80 {
shift += 7
continue
} else if (c8 == 0x00) and (shift > 0) {
return "#bad block header"
}
shift += 7
continue
} else if c8 > 1 {
break
} else if c8 <> 1 {
return "#bad block header"
}
this.block_uncompressed_size |= (c8 as base.u64) << 63
this.block_uncompressed_size |= (1 as base.u64) << 63
break
} endwhile
}
@@ -26,7 +26,6 @@ BAD 7759aecd test/3pdata/xzsuite/bad-1-lzma2-8.xz
BAD 3b80e9ac test/3pdata/xzsuite/bad-1-lzma2-9.xz
OK. 15a2a343 test/3pdata/xzsuite/bad-1-stream_flags-1.xz
OK. 15a2a343 test/3pdata/xzsuite/bad-1-stream_flags-3.xz
OK. 15a2a343 test/3pdata/xzsuite/bad-1-vli-1.xz
BAD 15a2a343 test/3pdata/xzsuite/bad-1-vli-2.xz
BAD 31963516 test/3pdata/xzsuite/bad-2-compressed_data_padding.xz
OK. 15a2a343 test/3pdata/xzsuite/bad-2-index-1.xz