From: Steven Liu <lingjiujianke@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Zhao Zhili <quinkblack@foxmail.com>
Subject: Re: [FFmpeg-devel] [PATCH RFC] avformat/hls: check IV size inside EXT-X-KEY
Date: Tue, 12 Apr 2022 16:32:21 +0800
Message-ID: <CADxeRw=sOzQrgK=+hTbB0EdLvZH+fJTrA5aJDNtMcF_hht5t8A@mail.gmail.com> (raw)
In-Reply-To: <tencent_9D38D0ACE6D667FB2A84D32B5C5A4BAA2606@qq.com>
Zhao Zhili <quinkblack@foxmail.com> 于2022年4月12日周二 16:28写道:
>
> IV should always be 128 bits. If the IV attribute was truncated
> inside EXT-X-KEY, padding on the left which is the same as when
> using sequence number as IV.
> ---
> I'm not sure which method is better: do padding or just return
> AVERROR_INVALIDDATA?
>
> libavformat/hls.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/hls.c b/libavformat/hls.c
> index 83ff4cc607..a7b632c20e 100644
> --- a/libavformat/hls.c
> +++ b/libavformat/hls.c
> @@ -810,7 +810,13 @@ static int parse_playlist(HLSContext *c, const char *url,
> if (!strcmp(info.method, "SAMPLE-AES"))
> key_type = KEY_SAMPLE_AES;
> if (!av_strncasecmp(info.iv, "0x", 2)) {
> - ff_hex_to_data(iv, info.iv + 2);
> + int n = ff_hex_to_data(iv, info.iv + 2);
> + if (n < sizeof(iv)) {
> + av_log(c->ctx, AV_LOG_WARNING,
> + "Incomplete IV %s, padding on the left\n", info.iv);
> + memmove(iv + sizeof(iv) - n, iv, n);
> + memset(iv, 0, sizeof(iv) - n);
> + }
> has_iv = 1;
> }
> av_strlcpy(key, info.uri, sizeof(key));
> --
> 2.31.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".
LGTM
Thanks
Steven
_______________________________________________
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:[~2022-04-12 8:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 8:27 Zhao Zhili
2022-04-12 8:32 ` Steven Liu [this message]
2022-04-13 11:53 ` Anton Khirnov
2022-04-13 12:32 ` "zhilizhao(赵志立)"
2022-04-13 13:02 ` [FFmpeg-devel] [PATCH v2] " Zhao Zhili
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='CADxeRw=sOzQrgK=+hTbB0EdLvZH+fJTrA5aJDNtMcF_hht5t8A@mail.gmail.com' \
--to=lingjiujianke@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=quinkblack@foxmail.com \
/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