From: Marton Balint <cus@passwd.hu>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] Fix issue when invalid nb_index_entries value is read - SPONSORED BY INA (Institut National de l'Audiovisuel)
Date: Wed, 8 Mar 2023 23:05:57 +0100 (CET)
Message-ID: <a5713d4b-9e84-d8be-1223-4877d82ee0@passwd.hu> (raw)
In-Reply-To: <928dcb75-6411-4e33-caa8-5cd247f8a185@ektacom.com>
On Wed, 8 Mar 2023, Cédric Le Barz wrote:
>
> Fix issue when invalid nb_index_entries value is read : in case of false
> nb_index_entries value, ffmpeg exit. This patch fix this problem.
What do you mean invalid? Is the value wrong, or is the file truncated in
the middle of the index segment? From the patch it looks like the latter.
Is there a single unluckily truncated file that you want to fix with this
patch, or multiple files can be affected by this fix because e.g. they
are written by the same broken muxer?
Overall I am not sure if we want this applied, the user can also opt to
avoid parsing all partitions with -seekable 0 and read / remux the file
sequentially ignoring any index, so if somebody wants to rescue the data,
it can be done as is.
Regards,
Marton
>
>
> Signed-off-by: Cedric Le Barz <clebarz@ektacom.com>
> ---
> ffmpeg/libavformat/mxfdec.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/ffmpeg/libavformat/mxfdec.c b/ffmpeg/libavformat/mxfdec.c
> index 4530617..ffc8987 100644
> --- a/ffmpeg/libavformat/mxfdec.c
> +++ b/ffmpeg/libavformat/mxfdec.c
> @@ -1221,8 +1221,18 @@ static int mxf_read_index_entry_array(AVIOContext *pb,
> MXFIndexTableSegment *seg
> }
> for (i = 0; i < segment->nb_index_entries; i++) {
> - if(avio_feof(pb))
> - return AVERROR_INVALIDDATA;
> +
> + if(avio_feof(pb)) {
> + if (i == 0) {
> + return AVERROR_INVALIDDATA;
> + } else {
> + /* To be more robust to invalid nb_index_entries value,
> + fix the index entry number according to read entries */
> + segment->nb_index_entries = i;
> + return 0;
> + }
> + }
> +
> segment->temporal_offset_entries[i] = avio_r8(pb);
> avio_r8(pb); /*
> KeyFrameOffset */
> segment->flag_entries[i] = avio_r8(pb);
> --
> 2.34.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-03-08 22:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 15:55 Cédric Le Barz
2023-03-08 22:05 ` Marton Balint [this message]
2023-03-16 9:45 ` Cédric Le Barz
2023-03-16 20:28 ` Marton Balint
2023-03-20 15:52 ` Cédric Le Barz
2023-03-20 20:03 ` Marton Balint
2023-03-24 9:13 ` Cédric Le Barz
2023-03-24 10:22 ` Cédric Le Barz
2023-03-26 21:06 ` Marton Balint
2023-03-16 13:33 ` Cédric Le Barz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a5713d4b-9e84-d8be-1223-4877d82ee0@passwd.hu \
--to=cus@passwd.hu \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git