[FFmpeg-cvslog] avcodec/flac_parser: add missed opportunity to check crc

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Sep  5 20:16:13 2022 +0200| [0912e79376601f5620e29e448086515760982909] | committer: Paul B Mahol

avcodec/flac_parser: add missed opportunity to check crc

Fixes #9621

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0912e79376601f5620e29e448086515760982909
---

 libavcodec/flac_parser.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c
index 11cd5540cf..5b3a4e6e67 100644
--- a/libavcodec/flac_parser.c
+++ b/libavcodec/flac_parser.c
@@ -455,7 +455,7 @@ static int check_header_mismatch(FLACParseContext  *fpc,
                                  int                log_level_offset)
 {
     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,
                                          log_level_offset);
     /* Check sample and frame numbers. */
@@ -491,8 +491,22 @@ static int check_header_mismatch(FLACParseContext  *fpc,
                    "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 (deduction && !deduction_expected) {
+    if (check_crc || (deduction && !deduction_expected)) {
         FLACHeaderMarker *curr;
         int read_len;
         uint8_t *buf;