From patchwork Thu Jun 2 12:39:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36057 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp4010760pzj; Thu, 2 Jun 2022 05:39:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHuhetNfoRvOO2BhG7Ax0fFqj4ZNq0+aI95TQrPN727FP8FgKVatFpHB6EdufDk5cilG0f X-Received: by 2002:a17:907:c20:b0:6ff:9e32:25d8 with SMTP id ga32-20020a1709070c2000b006ff9e3225d8mr4203689ejc.62.1654173558749; Thu, 02 Jun 2022 05:39:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654173558; cv=none; d=google.com; s=arc-20160816; b=ATMqBIcTjTjoRVA9i9RvxMIatfgGMUHbyb196OwtN2s9G+M4QQYvxb5poDjvRMkccW N6xGOsYxLsBRReOWVjWkTtSJFtcxRA0JOVt4cdq6lDZjGd3D+fH/hYl9TIn4WMEoPrtd PLCn/g4qHkjYx9iUKA+DSPycOjOErlZxH7ga5jwP7DozxzzRY6/uRMxLW2psfSRpu6f5 EUPGj16Xg775gqaHx5QFc83XZPTznqxqA0OR6clCcjG99wwXcZs8LyAFk/IfA9yfBk1l T6aemyZTQQBr/lJLfFNgvo7+bAB+TysR87DdIVmZcPwm7DEo1uJql07E6YCLnqrNWqcP D+8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=doqDEXjA2OKcqGl7JYEFlaw4/K47VrTvmKR8JGYEhnk=; b=hJowet0DC85eeP+CP/jDQrO5XSdciMp08zPDVHVl7oIn0wNrxx+OlDimT6cvmikY+v raLpzu9yDx0nlLRyDDjVPHv09EFwWO40nyQd0rWQPPQa7snfgZyfFeOOZlHerfXRUMos yzL737XNZcPKJ0ahilgiTfkz/SIvUp4jyovBk7iMifIEHKg1IwMBKTDgV7qZBk9TO7k5 aW5+WhBu2i7Cc3Zc6KJWTqXlvAqTHcAfINLO9UPIw5nrJHaZgmRx/68VFmguZXEa31ON uxZtZBDfxkL1tnWDE6QGteJgzjuT+PabxmFJX1wLi2pB25dgCl9Rrhxu17ZHfsVkGXPS uSiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=dhg6GtIP; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 13-20020a50874d000000b0042ab170477asi4518636edv.267.2022.06.02.05.39.17; Thu, 02 Jun 2022 05:39:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=dhg6GtIP; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C73468B7E8; Thu, 2 Jun 2022 15:39:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B28068B634 for ; Thu, 2 Jun 2022 15:39:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1654173542; bh=WWMYwAcpY3X8DDG2YsZDYtnDzJCxcNsbZFKsgr0HUd0=; h=From:To:Cc:Subject:Date; b=dhg6GtIPc8XZdk7cKnwUctgbBGS7WtMNQKfhj5+xWTsLUrhpW95+5EXmLlWRK/fGe FccwTIiO3S04WqNsK1Pn6mStfK+oh7M6aAqZvvx8TobZXEIwnYNZ/8L0/wqHvKZPhb y/ktl5cig2ubhVyFaC38v9emSYAXfivT/fmBo8L8= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.61]) by newxmesmtplogicsvrsza5.qq.com (NewEsmtp) with SMTP id 9C0106FE; Thu, 02 Jun 2022 20:39:00 +0800 X-QQ-mid: xmsmtpt1654173540tvmxwaofl Message-ID: X-QQ-XMAILINFO: OdIVOfqOaVcrhpT2OL2zhnfA68yVCmsft9n0o0fj9+wrrHRGT5bdZkEeG3rIGV zrWPLf0o5eXWtr9uS6zsEEGCrH74452KJ0Lyf5BKc1lTrG5ZzpEOfM7cd7u8vw8R8IolPfEoaCQL Uqr1fYdYZd4VvniCTc11nO5SykQPyldy/ybzMEUnhfZgf6g8F8vYpFTLGSHhwv7TCmaKSL9L4Tx4 teZIAm12BmirY4ioOeyLPgH5VvqpwmtavosF1d24KNQSuDBt7MIKFIXRavgs0hW5T7nBk0Lm72Zk OALiEozQju71z+wmVN6wJzB/WtnkunZnaB9KJh9fxSQAOLMqDsKryJNZHMy22/Ca6NZhjMRKtTtb wiKRz6cu01m10HRG8zBs/miLwaRjAR1U3QuuLwajzV0b6tt1TN485Zs82b2pZKSiYWhybXKAibnM g2Wn8/CMlCYzU9t4J7LMQvTtHHuI34UE67NLiCEhWxTccAu8f6vGjvs88dQI6zvtbudT3S8SoyGg JU71aau/MXr14Rp2mZlHSfHgPKO+AIXG0HkS6UqmAGZoM9v8eJqRmSDT9b79unuI6LgZIi0rkItv 10UR2TxZOeyqJVhLI3+hkR14wKkKA7zg19B5CeS6vkqyKv4Y5jF2O+SEG97g1AWMHFJV0m4mcGv9 VWl/0a/7Nji4QvpykamvfNbthNdvI4uIM9nkbN7FWsPrbB13T9xgG29H+m9IJiqnNH/Ww7dTUJyz 7WDo1BJeQzEAaUY8qQddmg2eH/PV1m1Y5TxtiDc/isLJz/LR8RlnliXyst44k5ERy/dlPA3B8DQj u2U9UK8vy/odb7AtIqUd+4qggPVtWezj5oeAMf70rylNCUWWSmDmHRJGxfHTQqtPdOdS5hfHed6U z7l13EbpVJe2p1a4anDnyZ+6iBTFw7jgCGItqlumDIiREW8sM0yCU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jun 2022 20:39:00 +0800 X-OQ-MSGID: <20220602123900.23671-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libuavs3d: fix potential index out of range 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: N8UQnVML0OZ/ Signed-off-by: Zhao Zhili --- libavcodec/libuavs3d.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c index e911963a41..7c6c3f0440 100644 --- a/libavcodec/libuavs3d.c +++ b/libavcodec/libuavs3d.c @@ -84,13 +84,13 @@ static void uavs3d_output_callback(uavs3d_io_frm_t *dec_frame) { frm->coded_picture_number = dec_frame->dtr; frm->display_picture_number = dec_frame->ptr; - if (dec_frame->type < 0 || dec_frame->type >= 4) { + if (dec_frame->type < 0 || dec_frame->type >= FF_ARRAY_ELEMS(ff_avs3_image_type)) { av_log(NULL, AV_LOG_WARNING, "Error frame type in uavs3d: %d.\n", dec_frame->type); + } else { + frm->pict_type = ff_avs3_image_type[dec_frame->type]; + frm->key_frame = (frm->pict_type == AV_PICTURE_TYPE_I); } - frm->pict_type = ff_avs3_image_type[dec_frame->type]; - frm->key_frame = (frm->pict_type == AV_PICTURE_TYPE_I); - for (i = 0; i < 3; i++) { frm_out.width [i] = dec_frame->width[i]; frm_out.height[i] = dec_frame->height[i];