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 07AF64623D for ; Tue, 13 Jun 2023 07:37:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C38168C378; Tue, 13 Jun 2023 10:37:33 +0300 (EEST) Received: from out203-205-251-36.mail.qq.com (out203-205-251-36.mail.qq.com [203.205.251.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B47068BF82 for ; Tue, 13 Jun 2023 10:37:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1686641837; bh=TqSK5y2ecUDZMEzwyLo0Nsv+vI/mCz5GzPQfzDSgK3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ycgPxm4/cT73JFkHCI89La2vZYOSXqzN/zAIeNWYOi7KP592TA53spw+7vgGfGHwO fKxD/WFPQ45kbnH9UEj4uTOo0RZodvHNJx6pL7/5D1X4r021rdJukEY9mKZnIQY084 eDO1NJQKpTdTduddP/AQlgLCnXaentCCTY9B69o8= Received: from localhost.localdomain ([113.108.77.65]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9501FE5D; Tue, 13 Jun 2023 15:37:16 +0800 X-QQ-mid: xmsmtpt1686641837t20im8yhb Message-ID: X-QQ-XMAILINFO: MB5+LsFw85Nobg9zNEmrxuxOzkrB+UeAqBmBJJMtovM385mAbLKwgW73J7a1eH MBKCPewKEdEsVepq+9eW0tdpKl0Dt/MJ3JtS2gU3NYQHBnxn0SyKNcwqMtEKB+4aK8yOcY9QNUMo pxPVcyqb/w8R6djtns7zUXCU5AqOMkalsvOwsxU5Sr6k7TZkdyYlqrqQoELMnyUqE4juz8+BILuu PlE3A9znKEY1wdBbzAhk7ZBcY2hy/xuxdSY7OKgWonSAyuVRVYP05B2EnzOeUvXTfh6cRH3UNFZe gsf/FQuJkz/WMK7wK8PabuHDGTAlEdanCGTixGj+YEf8JY9VqYRsN2Y681TtUhBz8et3uKIviX2x v+2zCvEB8cPCSoG88+Qf5VgsXFV4VeGzZ8aYMTHvtSdy6HPCjreCDWRnEqiyiePbZ3Ao/YU7N+G+ Y18LidJ/jCQ3XuZONC/peEmo33ZHtlkjIZ4yDjfW+QoNv0hOnD8mny1JYfVb6P0c1DKFyzZu0uu+ wrtg8gK0tJ8NvUyJ3fQh/+F4lCfzqUGMe1jXOpCZpQlMorHwUE86Me9LZ8ul47lW+IGHNhYP9Qat 99CE+4hjwUiFlWiYL5LQ31zcO8iJ9H0/3KNV1VZ1sE0blZeL3LtCrRK9ZUumsp3jDCp4d1YYa8hP DwD1bfRYgeYTGaXfGW7GNHSjUaV3yGiPa7xk2qFFCKnnx3nr2qZ5/cXmZYSBNweobXbMdFtakwgh csA1av4tGG2Lq4+Amx0SIOkXqJNBUu+aCcMtzwrs94LNCozDgHWdS3h5K3XSve0Q8hcYPsP1J0X+ 9eBJptHQNgL5iVhJxiedR51g6VdRYvuKtGIcYzI/ED16KwrSxWfO3RTjXuhm7SBD9agTXHnAnx96 8QX11NlvKTti/nF/OpUMLmIjW2xr5TpiGae0RvV74qhWEay0qnuP8xQW2txfIZfPYCSLpRNkNbax zHeEeIA72zU6JaZMdEUZm7XIcV23nEN6vQrg7oVRAlQ4c3jKntgH3475eBAtvb X-QQ-XMAILREADINFO: MFSZYyQdPxvloIttF8cZzD8= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Jun 2023 15:37:16 +0800 X-OQ-MSGID: <20230613073718.675388-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230613073718.675388-1-quinkblack@foxmail.com> References: <20230613073718.675388-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/hevc_parse: check the size of hvcC is at least 23 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: From: Zhao Zhili The code after the check skip 21 bytes and then read two bytes. Signed-off-by: Zhao Zhili --- libavcodec/hevc_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index 1f3beed183..7bc28fd081 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -88,8 +88,10 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, /* data[0] == 1 is configurationVersion from 14496-15. * data[0] == 0 is for backward compatibility predates the standard. + * + * Minimum number of bytes of hvcC with 0 numOfArrays is 23. */ - if (size > 3 && ((data[0] == 1) || (data[0] == 0 && (data[1] || data[2] > 1)))) { + if (size >= 23 && ((data[0] == 1) || (data[0] == 0 && (data[1] || data[2] > 1)))) { /* It seems the extradata is encoded as hvcC format. */ int i, j, num_arrays, nal_len_size; -- 2.25.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".