From patchwork Sat Aug 6 06:01:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37150 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp693488pzg; Sat, 6 Aug 2022 02:53:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR7zvJODkM8ys+DpzamymgWZMw/oXR+vIIMr7K7RoViuKWP1DxX2/wNhULPawuGT97ZPl0iP X-Received: by 2002:a17:907:7f11:b0:730:6f6f:e444 with SMTP id qf17-20020a1709077f1100b007306f6fe444mr7622038ejc.657.1659779595891; Sat, 06 Aug 2022 02:53:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sc35-20020a1709078a2300b0072b2377bab0si1865282ejc.649.2022.08.06.02.53.15; Sat, 06 Aug 2022 02:53:15 -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=@outlook.com header.s=selector1 header.b=QKEXPmM+; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5DA0E68B6AF; Sat, 6 Aug 2022 12:53:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2047.outbound.protection.outlook.com [40.92.91.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5075E680787 for ; Sat, 6 Aug 2022 12:52:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jZSs+JIhZi23PhL4nGBLAdb3sgV2ayboqU8hTRS2Y2TNam93lFT4B9I9Xx0vffaAe/+IlgB9X84M1PBCyIePJKJM9eJktR/ZAh0FuIHH8vvEegtI3oklIKy8v5bUzMXDph/uNk2OROmtxSCSAjFY2MJByj4swh9OgiLD+zyzd65D0Ya7zDoOdoXAS3adxDnMDISMx4E2VSPQjsxSTHG0pvPzmRLQfSjZZUx3xqhL6l9qKovBD8caWpZjGa71pGYPAzempHekMgxPmaL0Z1//FM7y6Krgi0jRCyIU/4w/iwzhXtkZfzN85yGDro7F+qKRRxhrM0Asa0WieVo3efafyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Tts+8ACKtkHbDIufjMdv34VjY9SMwRDafD3UrjKuBFo=; b=QbcEDoU44EPlMAH0SpePrjmAjn1e1doSm6RNIxCIkYh6SvediOoZf/DK7AxFZz5nZyXvUbNjMkmmcGitOAPxQIMkcTr1lOnCq9JcBZdaR22m2p8co3NC0fHKDqHNY8CNsXZqJ/8Zejs+pSwx6j2BL8HXgvKkVNgmti1MEDR21D7rgLLM+slUFk5bg5+d5xFII8jQy8Y4p2dUuHl3Es0zydlhr2xvwUUh4ab4LfYjGOV5oeE1yLeB99TOlHH9P3OdBGkc9BcdClGuq8JQnraPUBXZRAMHqb0QUT+qE/maX4Ma7DmGXXIcgvx/yRQPw26vEa4efwfhzNYtzSEwpeSSMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tts+8ACKtkHbDIufjMdv34VjY9SMwRDafD3UrjKuBFo=; b=QKEXPmM+WWmqfbE4Wb4zhRCdT2s3zISHbb/DCCTikxaVNVctfgiqJXuRza9OPI/4PiylpiIfJBleyvDgsSlnZ0Leb3ypTlRQ/2i9291ACZ70Rc5iQj/uS59lqJT6Oa68aaYQ1F49Yq3Fa7V2UqEhWARjobxmiIc58W4oNym4aoHf4DdM1z4gx/OLhJ6a8BH4DIiKxB1e78MDPfopBtsAah2qCIEmBOSxhOnLxrP/gIBpTidbGleYswCxQYGkpUpBzTCncgv7//f2zNPhqqm4soHGNF5q+3G7DE5XIsffQyQOhgrgRTFICHJOGDpqOOU9JuehtPT2ITinvxVQWTFchg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR0101MB2512.eurprd01.prod.exchangelabs.com (2603:10a6:800:50::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Sat, 6 Aug 2022 06:01:47 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.016; Sat, 6 Aug 2022 06:01:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 08:01:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [pUrJaj2MiaQeVWcnuA0r9PA/X1Le9Fxe] X-ClientProxiedBy: ZR0P278CA0031.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220806060137.99948-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27f352db-4ce0-4425-8688-08da77712545 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQiH/UTwvIUf9tTFffvqgut2JumTCCA5nVkJ04uGcgiBs6Vz4PUizATUXlWktQF5ANhb+YAPjcl8ohyGRUe9I01fQ4xH0H/ZXD3fg5kVH2GVgPYO57PtUlTqszg38pddZuKbDb6CXGy7JUrJaojggTAvnZ396KT8L72NbMZlluekI7yqsDoq9x8N9FYeLAi3PXtF91t9T2jvv6x60gsuilHZSIGlJ1DjCl7Av0GEntgValBflL2oQG8O9kZaiZPOy2of22rO4WkluFKKNiJqiWl5zQ2KYwYfKd84gDytCLMDiTLQsQC66EvMSKQ9f2Kqk/Ec1HmkS1g9r1XbU0Yoy9r9N4GcLGHthUKe6Bqnn27uf3GK2W4OMkNa6xab+ikarKDS+viJEno+lE2nAY1GsYwNgkmbF998/jxk+LHyhc1V3opT0WgwrgMUwgeTOe0CrtFEAgu904XOzkYikgaKtlVz7mKfC2ACT3MPFWhVaychlT78Tw5Rn/gjBsvOXijLCkSw3DSkcUDsh39pH0fN2D2dJ2bDdTK/8mBsuYbJdkLjI9WXKhMd+iXTSnvfMd1I207dWi7qW8sCVs7TmC0PMRqGtt7Dmm3dvzNPKZl998+2wOlrVcgK8OfwDJvLpiqMvjXnikEXc82w3pmXVqqVVZlSsnvzeW3Yc9zi8yzesVxl9v7v0qq8nd8Oy13gQGpWzZkpqpMAne1qr/Gm2Rohod8WrDnpM3i+n/Fn9c802in9PEGP4Cs+9as9JBVuMUo+og= X-MS-TrafficTypeDiagnostic: VI1PR0101MB2512:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: peCtYasFFPJ5ubDZmEI+xRq1qYeYV8Ky+UEhoFLT85Y0V5MJy0RY4zP0lFptyZ6bGRlFBUZ4DBxZt+TIiScTlkJuuBircIasE7p1UldThJHdBVwwDb72azOIsQH7LbOtHVzXojrrE9kO1JY8qvCSGevL/BRdgcWBTQ3Pe0ydfd3gEILicRaHsF3hZL8aCQrT/49uS1Npkk4x4SdG5UJs03PTAP1p4ofV9c1L/TxBtS1BtFg1Zgb1+eKfLfbZAW3v92yOBGHHZ94TJAa28AjRRZWvr5T3xWEo53ak3qnA6p4+hcWvXE6Dka3KNaT3mv2mqVOH8zaD8ShSE65UkKNK6vOmWJSookj+JhcyMq2gMb+K0ZfCbtB9DQ5LqJ3B6U48WHSzmrkMOH2Gz6y0za1KPmnaQvL4aLYq4/orH5A4hAthNmfiVdOB+EJ8+639PZi6AM1El54OUR40nFqwJyyjgJTEeFHct+MQNa9ss1TaaJl9ekbb+rzVNvbNyoibaioxp4ffbQLV2NwF9Yokpgbz7QAXAqBS5z6o5IpobuOrzYv6CHjAG22gMColyrjPZmqmwxrY7uS81KqYDnRjq1bjR+o/EJevnd7KW26cs8QOQUuQA4qDyRPauKR+RJ+UnKF6C815B5wNW6quKc5DMPBTEQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UX5NsSxh6W4R6CIaIIMUBXpiU/kNVSVREySBDuqaNf1O8pmr/r1xgzME0ifCqi6gH1i3KNAmCuqn8mP5B94H6sRre+tVQDsAoq/FSqmefmqR5BkCaSNPcPbN6/7L3SgLg+qjT0LJh18skzm7JjaZTsmGnJILFLuOLDm6WKYtKR9+tTcnEHC2Xe+UEvPNMDg6eG9XuGtFlNhacvsylIHTSvRlYKFLhOJKxDM1IydsTX7HvZh07aMiig8j64HqmQUrowZgtgsuEChBfK9CCVEtP1DZ88cvL1yeiIUTnjGF11a3xGtnYqEiCM30tuE5LM1/VDtEgsBBWFL7Rb9PtLM7/xlQ4rXCYBG/eWURax8SEGfmC+Vpgh6uhpqfGPyOiJmTYfIZSFkQynA8RQ3aZOxG3gedlYTabK2OazKQgL+3DGhmYThJ7Z58HNe0YLr5BxMCPSWvZQ5U9GHocCv7/vLDYeITiFDc/JaiKdrt7+9rV1G1nIRm0H7JO7l423XkX3cF75oTJTgC93WmvYGqwY1xDg472D+8S12oTl+WpyGd350aVbsbwrIP9A6R2gf3dCt7N2/0KvYECDUmTIVz4pOOF5XHvfEX8Kqx1xuH5ekMERGjWqpIu609dbvzv73ghrWjvRh05KiX/8xY2qqs0a4DA31W41VcpqN3kez2E5+KwHhVKJmI9BlzSMvmkDt7bZtioJAsHXgS+MEtvlLZGfcFXTgrSHbhzaQ/TswrXqPBUBLKKIdoT0FA93S+GTXQfM0KEheBfq73fYmc2VEGEIK0MhUgVJaZyLxw9/y2xGYbVhsJVnvd2YstSGdDrNduQFuOasdRuWHxQ3iWZHUgBCDihd7j5FjcWIpeDmNiNk3qCCkLLRh/iQfWr5ZO2xlB3KPD5h7AK0CMi0ZHEMqBf7s+Qbp+uxD3zpbTCjAZ+kezvuNR669v/Ss78t+PkdUtsFOSTr4ed3jKjMC/7+LKUBeDLtrW7EqHsGvWKyyGYB9fpni7EA9UBdO/oxRbvj168dG3ngPvTu6PRGVQZfgJIAS+FUtE5i91kmVV4B2zqMs7XCeLObV/1U1SlEE+W4pfRJ2d/uP6/RCP/MR0QAZaQdA5I05mZzk1dq9W/HeomUu+X5UWhExK5d337wiClbJQNquJY56zHxe39LqAVNAMHUAGc5ASyGA1t0OyAXCmSUSeRR4r6BzguXD3R+AXx9UW7k6NusODhm9+p2GFETMhV7sOFBbKR31EJjIo+ngd4segS/INrhztUirY+xU4T4KMwPc3iMxeMqzWE7nuuygoMVRYjPTJ+H5pP4pvyVPQkTpu7+c= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27f352db-4ce0-4425-8688-08da77712545 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2022 06:01:47.3231 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0101MB2512 Subject: [FFmpeg-devel] [PATCH] avcodec/nvdec_hevc: Fix off-by-one error 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UQnVy/an0pkl Fixes Coverity issues #1442912, #1442913, #1442916 and #1442917. Signed-off-by: Andreas Rheinhardt --- Given that hevc_ps.c checks these values, it is actually impossible for this error to be triggered. libavcodec/nvdec_hevc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvdec_hevc.c b/libavcodec/nvdec_hevc.c index 590278ba04..cd549d2ef6 100644 --- a/libavcodec/nvdec_hevc.c +++ b/libavcodec/nvdec_hevc.c @@ -204,8 +204,8 @@ static int nvdec_hevc_start_frame(AVCodecContext *avctx, ppc->row_height_minus1[i] = pps->row_height[i] - 1; #if NVDECAPI_CHECK_VERSION(9, 0) - if (pps->chroma_qp_offset_list_len_minus1 > FF_ARRAY_ELEMS(ppc->cb_qp_offset_list) || - pps->chroma_qp_offset_list_len_minus1 > FF_ARRAY_ELEMS(ppc->cr_qp_offset_list)) { + if (pps->chroma_qp_offset_list_len_minus1 >= FF_ARRAY_ELEMS(ppc->cb_qp_offset_list) || + pps->chroma_qp_offset_list_len_minus1 >= FF_ARRAY_ELEMS(ppc->cr_qp_offset_list)) { av_log(avctx, AV_LOG_ERROR, "Too many chroma_qp_offsets\n"); return AVERROR(ENOSYS); }