From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 57FAC42A6C for ; Tue, 12 Apr 2022 08:28:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01EB668AF91; Tue, 12 Apr 2022 11:28:08 +0300 (EEST) Received: from out203-205-221-239.mail.qq.com (out203-205-221-239.mail.qq.com [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F12FA68AF91 for ; Tue, 12 Apr 2022 11:28:00 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1649752077; bh=Z18aC0Wp2gWqqvxhON9ecOWcU7HZHa6m67i4Wur1F+0=; h=From:To:Cc:Subject:Date; b=YtxcVi5tmEOM0PHuT46ir+f/Pza1bVtXm0C3QXNgrS6fTzCjb3zPxKgbE75jqpz++ sEM9APwfgpdNQNM9QqA31pybyQDz8sxetS6b3zv9pwG+kuqiMxKhuYet45B2LdqYk0 ndNLWNNm7YinQdqFmlnopPxMfu2G2BrSLruSedFE= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.68]) by newxmesmtplogicsvrsza7.qq.com (NewEsmtp) with SMTP id 6F72F83C; Tue, 12 Apr 2022 16:27:55 +0800 X-QQ-mid: xmsmtpt1649752075tke56f1nl Message-ID: X-QQ-XMAILINFO: M6lqjKFHeg8FFxxnYwBeB5Y60J8OsJhJMLfogaAiVGrsfkEU2ZI/Qc9Wy6Qe1M xT92kPQsuQMjXLyjX0uslJSfdbZf8Wj7G8uYOlP3YkIAPEASwnUL1NiUgt3DY2cPaE3gQWSx9YGd /KzvSpuH20ZXpNBvlSHrsXyXmV17+Zm6wh5pX+5cATJCq5vwVhgaj/K5bvYX4mwBZ2u61aLUYZCe TSuPZCq/+skW21owMJ004tK/LHbkZ6C8Q/Uyv7bYZZKsoyc1twUV9dbeN5zKFwibYTUYSOy2sF+U rqe+GxzWVqtr4JgQdmMYnWRf7qYjusrMVmrbkrwf2GLfIGyIbGm+vJWdoeG5P9l0edFFIW3fZwO4 cG8aWyTlMZh/J3P06xpkdHu2ITABh0X552OGbZ+K2hwn+Y4BqUl68IiVYdTgi1AjDnQ3Q1tXMfuk yGoLQDTE1MZMm1xEY0cZwOpHW27D2aaG2cTlZ3MH+LweenvoTek+yakNSzbh6XjkaY+Zyn9vzcVx F3gBQlxDNh7ay7yICNspLbdFbzsBZYgTmVdSzVh/E+LWlSl7+qA4mbhkxEg61gYu89CznbmCsRHt MGd2kvP2p3IdArf3w/iZQ+IzaojAaI88YpwGl8uGIyZ0lUKbphDzsgGM9xb5ZfKWjNCG73l9/p+B DnzJ93vAMxKJK8tNMJTHHzGR8qsWnieG3vRpevUDChJ++zL9SCalDqwop7fxEO3ReTQ7ztOJdiZt bn+SF/xeR2kvtwMmUR5s9h724zKP9hkxqJkSpIIrlIA0HAh55dKiHoewEkI50dzFWAdg58m2xRwc d1E/9bs0w3AN+/VLEbHhDvU5422iBvonLtBHRo5HsVogaD7ciD8Lh0ij1rY2/mHouMihSVbTFWIp +qas2ruxU+6s3IjW2qJGpF2pt0PtbIsD6qMNY5u4TzsWBGHFwO4RlHRlmjwrkSp/1wp2pA866V4l Qm2SWTd7hTwABT4X4c/A== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 16:27:50 +0800 X-OQ-MSGID: <20220412082750.44825-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH RFC] avformat/hls: check IV size inside EXT-X-KEY X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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".