On Thu, Oct 21, 2021 at 10:35 PM Michael Niedermayer <mich...@niedermayer.cc>
wrote:
> On Thu, Oct 21, 2021 at 10:17:25PM +0200, Paul B Mahol wrote:
> > LGTM for now
>
> will apply the improved variant below
>
> diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c
> index 2c550507fc8..3b27b152fc5 100644
> --- a/libavcodec/flac_parser.c
> +++ b/libavcodec/flac_parser.c
> @@ -55,6 +55,7 @@
>
> /** largest possible size of flac header */
> #define MAX_FRAME_HEADER_SIZE 16
> +#define MAX_FRAME_VERIFY_SIZE (MAX_FRAME_HEADER_SIZE + 1)
>
> typedef struct FLACHeaderMarker {
> int offset; /**< byte offset from start of
> FLACParseContext->buffer */
> @@ -99,7 +100,7 @@ static int frame_header_is_valid(AVCodecContext *avctx,
> const uint8_t *buf,
> uint8_t subframe_type;
>
> // header plus one byte from first subframe
> - init_get_bits(&gb, buf, MAX_FRAME_HEADER_SIZE * 8 + 8);
> + init_get_bits(&gb, buf, MAX_FRAME_VERIFY_SIZE * 8);
> if (ff_flac_decode_frame_header(avctx, &gb, fi, 127)) {
> return 0;
> }
> @@ -196,7 +197,7 @@ static int
> find_headers_search_validate(FLACParseContext *fpc, int offset)
> uint8_t *header_buf;
> int size = 0;
> header_buf = flac_fifo_read_wrap(fpc, offset,
> - MAX_FRAME_HEADER_SIZE,
> + MAX_FRAME_VERIFY_SIZE +
> AV_INPUT_BUFFER_PADDING_SIZE,
> &fpc->wrap_buf,
> &fpc->wrap_buf_allocated_size);
> if (frame_header_is_valid(fpc->avctx, header_buf, &fi)) {
>
>
LGTM
But i'm not sure about the PARSER_FLAG_COMPLETE_FRAMES case, hard to tell
if those code paths will always have
MAX_FRAME_VERIFY_SIZE+AV_INPUT_BUFFER_PADDING_SIZE buf size.
Thanks for helping to fix this.
BTW, yesterday a FLAC file showed up with a "false" frame that even this
patch failed to ignore. Strange enough it is a FLAC file with no encoder
metadata at all and the frame that it failed on is a verbatim frame. It's a
perfectly valid file with correct md5 but the audio is heavily distorted
which explains the verbatim frames. Hopefully they should be very rare.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
