virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/flac_parser: add missed opportunity to check crc

Browse Source 
Fixes #9621
This commit is contained in:
Paul B Mahol
2022-09-05 20:16:13 +02:00
parent 5ca781598e
commit 0912e79376
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/flac_parser.c
View File

@@ -455,7 +455,7 @@ static int check_header_mismatch(FLACParseContext *fpc,
int log_level_offset) int log_level_offset)
{ {
FLACFrameInfo *header_fi = &header->fi, *child_fi = &child->fi; FLACFrameInfo *header_fi = &header->fi, *child_fi = &child->fi;
int deduction, deduction_expected = 0, i; int check_crc, deduction, deduction_expected = 0, i;
deduction = check_header_fi_mismatch(fpc, header_fi, child_fi, deduction = check_header_fi_mismatch(fpc, header_fi, child_fi,
log_level_offset); log_level_offset);
/* Check sample and frame numbers. */ /* Check sample and frame numbers. */
@@ -491,8 +491,22 @@ static int check_header_mismatch(FLACParseContext *fpc,
"sample/frame number mismatch in adjacent frames\n"); "sample/frame number mismatch in adjacent frames\n");
} }
if (fpc->last_fi.is_var_size == header_fi->is_var_size) {
if (fpc->last_fi.is_var_size &&
fpc->last_fi.frame_or_sample_num + fpc->last_fi.blocksize == header_fi->frame_or_sample_num) {
check_crc = 0;
} else if (!fpc->last_fi.is_var_size &&
fpc->last_fi.frame_or_sample_num + 1 == header_fi->frame_or_sample_num) {
check_crc = 0;
} else {
check_crc = !deduction && !deduction_expected;
}
} else {
check_crc = !deduction && !deduction_expected;
}
/* If we have suspicious headers, check the CRC between them */ /* If we have suspicious headers, check the CRC between them */
if (deduction && !deduction_expected) { if (check_crc || (deduction && !deduction_expected)) {
FLACHeaderMarker *curr; FLACHeaderMarker *curr;
int read_len; int read_len;
uint8_t *buf; uint8_t *buf;