From: Gyan Doshi <ffmpeg@gyani.pro> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 1/2] avformat/mov: add validate_box_size Date: Wed, 22 Dec 2021 18:17:27 +0530 Message-ID: <20211222124728.7300-1-ffmpeg@gyani.pro> (raw) In-Reply-To: <tencent_C2469F31ABE24E0870F62D529AAC401F9A08@qq.com> Helper function to check if stored box size is correct and looks to be fully available. --- libavformat/mov.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2aed6e80ef..7de95b7ab0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -80,6 +80,40 @@ static int mov_read_mfra(MOVContext *c, AVIOContext *f); static int64_t add_ctts_entry(MOVCtts** ctts_data, unsigned int* ctts_count, unsigned int* allocated_size, int count, int duration); +/** Check if the box size meets the requirements passed in limit and constraint_type. + * If input avio_size is valid, it checks if box size appears to be available. + * + * constraint_type may be + * 0 if the box size has to be exactly equal to limit + * -1 if the box size has to be at most limit + * 1 if the box size has to be at least limit + * + * Returns 0 if size meets requirements. + */ +static int validate_box_size(MOVContext *c, MOVAtom atom, AVIOContext *pb, + int64_t pos, int64_t limit, int constraint_type) +{ + int size_fit; + int64_t input_size = avio_size(pb); + + if (input_size > 0 && + input_size - pos < atom.size) { + av_log(c->fc, AV_LOG_ERROR, "Box %s is truncated\n", av_fourcc2str(atom.type)); + return AVERROR_INVALIDDATA; + } + + if (FFABS(constraint_type) > 1) + return AVERROR_BUG; + + switch(constraint_type) { + case 0: size_fit = atom.size == limit; break; + case -1: size_fit = atom.size <= limit; break; + case 1: size_fit = atom.size >= limit; break; + } + + return !size_fit; +} + static int mov_metadata_track_or_disc_number(MOVContext *c, AVIOContext *pb, unsigned len, const char *key) { -- 2.33.0 _______________________________________________ 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:[~2021-12-22 12:48 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-22 11:30 [FFmpeg-devel] [PATCH " Gyan Doshi 2021-12-22 11:30 ` [FFmpeg-devel] [PATCH 2/2] avformat/mov: validate box size for stts Gyan Doshi 2021-12-22 12:19 ` [FFmpeg-devel] [PATCH 1/2] avformat/mov: add validate_box_size "zhilizhao(赵志立)" 2021-12-22 12:47 ` Gyan Doshi [this message] 2021-12-22 12:47 ` [FFmpeg-devel] [PATCH v2 2/2] avformat/mov: validate box size for stts Gyan Doshi 2021-12-22 21:34 ` Michael Niedermayer 2021-12-23 7:24 ` Gyan Doshi 2021-12-23 11:26 ` Michael Niedermayer 2021-12-22 13:13 ` [FFmpeg-devel] [PATCH v2 1/2] avformat/mov: add validate_box_size Nicolas George 2021-12-22 13:33 ` Gyan Doshi
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=20211222124728.7300-1-ffmpeg@gyani.pro \ --to=ffmpeg@gyani.pro \ --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