From patchwork Fri May 17 20:16:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48969 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3099901pzb; Fri, 17 May 2024 13:16:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXa6uo572Ksd/g9FgNXPiqNi89v/hOOzkWYQ/ogFK8qItrCbuIKL+DphUi2KFEgsKS4lTSTllysyp16Yn/KZgG82kx1ZTEoh4QWQ== X-Google-Smtp-Source: AGHT+IHZHT8tQo7UtOoHKJqeXiUQaSLmw0ELaeVysmikPyo5NDE72kCt2G57OwvTGsR8as2kmHQc X-Received: by 2002:a50:bb05:0:b0:572:65d3:8084 with SMTP id 4fb4d7f45d1cf-5734d5bfb91mr13888023a12.1.1715977008369; Fri, 17 May 2024 13:16:48 -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 4fb4d7f45d1cf-5733beacb66si9869264a12.10.2024.05.17.13.16.47; Fri, 17 May 2024 13:16:48 -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=AYYyEHlj; 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 7EFE468D164; Fri, 17 May 2024 23:16:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2076.outbound.protection.outlook.com [40.92.74.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DBA868CFCE for ; Fri, 17 May 2024 23:16:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ij3FGxoonOPQ6TAXYCwG7zDdN7Br8zno85GbTYl8OJ+WPFsnVxjbq+fh/4CfYoAz1Iagy4I7C6g4fJzSVxyrpBnEOPGxIm/XZ2sIMCCcBJSBb4ciQKJS+jicXUyFZ+A/gR+hfDSXtahPsjvzKPYSThiwyB95Uru3MWAqwCEfyvRVnRjuh+Fl4MDaS9aK+8FPWL5ylU5IohbHUN3DC2ZuNjoFp/z8N3/CLunaSwXPIOsLpy1DhDVWW4/rIHWcE1IswdQpWJQOs6B7yQ/DBE/rLEIK/mDCANBX6/TpdsDMfhOctYU6q1eRDQu0DWverDAIcQKitmeYTCUw2kc3syS9rg== 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=jqmEyl2QjqhDfDACyO/rCUMFt4eDMwDkpgCvjXuVnSY=; b=cNqfAPOtSHE9Q3U40pnEaLHXvM1hHznoS/4L76IlxjWU7AstrCy96ZRUle6b4qvJp5mBlFvu8dvhqoPq0i742FPdO+XiOaLHNaWdWpkQOxSxOIHjwI8gbUtztop9wzdui2wvRpUX5XGm/N2E5rphNSt1b0rxJPEVxk+g8tHY+BDu/rwlPJmXkoQQHSs2Uo8GqKHrMPXw6BWuuX1tJWHV9CEOL2fwjU/Eq/aH27wOAEp9ykguY0W97wWYJF+PcGh3wRahppK/ly+re0A2x9zBKsPv2FK//uRx7mwxElm28AFtuNPDDRfHrf5un8Hpx3AC+0WjfAc4I9pZ4+cHLm7G+g== 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=jqmEyl2QjqhDfDACyO/rCUMFt4eDMwDkpgCvjXuVnSY=; b=AYYyEHljhONh/wnuToIQRuAz0bNgUZnrpL5DUu3T05zkerssAG7oJKR9tIY+piXXNu2gRDihtrKvJRNhRiOhqzVU5MfgQ9gDRTPhfo4n53z1uxXGNTjJQy+Glyq8SYE2MFwAZZlHC0yFpqCJget8NfzgGm/O4VJ4kcFhGUl+eEAsL288wHu3GBrHDt7Hewc00EXFBsxtcLB7iar+7tPHAl5ysaV59QjsgFB8bei+IDnxTsH3nMAWme0oY4kPzncvL9/DZR/JpLo2VMdVwmsmD67j0vfbr1J3FHFjcB6nWFO6GxPXh21c4oqeY/RxACXKz0L53W/+QY/4r8VWNMTfGA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.30; Fri, 17 May 2024 20:16:35 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7544.052; Fri, 17 May 2024 20:16:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2024 22:16:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [snIzsxPMKMuMoy1nmQJOSRcH23vCPjz4HilaIEzK2os=] X-ClientProxiedBy: FR3P281CA0058.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240517201627.292441-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0025:EE_ X-MS-Office365-Filtering-Correlation-Id: 0bdb2809-ba11-4cff-d626-08dc76ae3fde X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: I9BKGyTIZn7KF3M2d3fkXfS8J0tR6tZVSh8Us/c4559qz/3NoQvTuRso8CSrfkeIBNkZjloDf5vVCBV3tbKgx+drL15PxKTqRAQH8q/HbfIwyGac49W9tz8BpZtnhjNm2otNjYwhi3teIt7FbM2njeByxabrToDV2o/8wXiwzjTqZiFKe6cGU3bZPyp41VHBKGdwxTgXL4zAUBU9XrxSZ/X26ZYMnfH5A1Vycl5K+1Bn+jKq1Vc451o1Wr9BwhtDiSD1soQylPsS5tl9GWfOVIEiSKNqCjxJi1QjTp7xfEpWbiZkngOoV6PUCHEhKt7AgK7WR4BUnhAlR61nBuU6EVyrdl8e4GByvqAeJJe/qaPJC7awuJiHojpFqLTcOcmKqTH2qr4esTJOCnGXgidKxRjFk2SmlEwFcrfLmkOsYH0CT+M0gWgMzW/0h/XkKJRrsfDHZ8aAjtiSFFGlDMpn+hxgRFDi3VBY1LcgBdjbyDzJhn+lOEZIhKfpyx31F0HZzsGk9CzvbkmMDsZx18WjxnkAnGJONwzX/rO4QFNXlZhVApwiSKiQKa8EKHpQy8zV/6wFuX5UPdcURA5ISmHlYHHYECDT2MAyqaUoNeIA465vQeIfvjwR3YyaJMvjxm0K X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9HfGQTNrwQ/AiiWUg6DUqA7zQwTQoA2uu+hgGS3PGWqh4ioO5EdcS7zS6ut8XUtb8sFi38JoD/nIGaD1QEoEE2xWPhT1/4Xg8JFVY0FAf9CnG/k7oLcGkhM67VE3A6AKcbPPiXjbth94uFw88z/G4XiZyN61vxdJ2nrVcdPghSPRiPh6eZNfp28BdVXnNC7jH0lX8Wmf+w1RVkus0k9K5wxaw/L9e7j0j13+zHIY2/s5M3bgxal41Dafy95ZoOwaLKFFNPYHMVzwD4hGAs9f59q5ZrAAGaJkovs6eFzc1VNFN5dn8VDzL51UxPf2/2bKX2TpQML0Hiyl9QyoENK++4/zqEAaxPqLc2V9ija4IM4a+GDIhxVI+of1PMGTOcO9FgVWbHbmUEFXGn8Yplq9FRcTU/g0HeOv3Yr7WYFl1muu1KGJHEvOMtYmrP5hgQoli4vJTU/ktNYa1lEPqhWrWLo7rDFWklzfnrluEC0tRx4GqGdmENRJAMe/h6tprjkJWsyaIc1r3Eg446k3dV9YEtDxh0U2F6V1bHFVznXo6CV4/LYf723RtkhWPDu00WFee9jU+Zuk5IcQ+9T96fY8kH/ft4A+7IUxt+6HKhSzsCT8abKo+ahksFjaSpI2qhyIoDfydWes4xYU83AoMNbuQ8RVQKwLd16zusiYgquWUKWeCWBvMHrDoLDYUiP3/9uBtiKuYvDy37LA3mtvCEA9/Sc/E2FKcJCzk2fW94Q0gZhzOTaP0bq1lp0dJnLpDErpIvWNEam1kNeY0/lB7GRu4dXDw+44NihJWRaPpBwe9qf33Nk8QZ/Hf8vRLEvbpY+SO7mT8td6anZswHNlncHDwo0xGmcKKw6MaZqGbpMk6QeF9RHN/qoJ4orgxR/xpV2Da3uyRZdhhcNSmjoeBVKnQDcl3gxI7vhZfhmrePzXSX5VjTK+8koEwK6MvVTP3lIk8zL+5thhD6Uydlo/Tfyw0/WO4M9+GklzONx03zzgTyLqVQwBy2EoagVMBJoqUw4U1vzQrk36ARPJxT2tIpf5dlsiRB4yXJpC+0XrDIaVZcXMnwEA7GCvAbiBk+PikJ/ziq/OeRIVI95LZ5Eq4qbn1kafJ847jjmGwCZYDQPlSrHSB3B2KtFR+M2n886MRsy34f7gY/Q8RL8Ieby8FZHkaN8ssjSm5Bf6dCEbzyRGbhXDr+Dub4vyLmglnTMbuHFesa7iwG5i26ydNbRD7y8luHc4rnqno9g64l5TiQHksPdcBXz+tRG+/xe72oL6cV9jbOHeBRu+iyLWP/Fj61M38A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0bdb2809-ba11-4cff-d626-08dc76ae3fde X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 20:16:34.9585 (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: DU2P250MB0025 Subject: [FFmpeg-devel] [PATCH] avcodec/vc1_parser: Check init_get_bits8() 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: DslDaBmamY0R Addresses Coverity issue #1441935. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1_parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index ec284dca00..a536a7bcf8 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -26,6 +26,7 @@ */ #include "libavutil/attributes.h" +#include "libavutil/avassert.h" #include "parser.h" #include "vc1.h" #include "get_bits.h" @@ -66,7 +67,9 @@ static void vc1_extract_header(AVCodecParserContext *s, AVCodecContext *avctx, GetBitContext gb; int ret; vpc->v.s.avctx = avctx; - init_get_bits8(&gb, buf, buf_size); + ret = init_get_bits8(&gb, buf, buf_size); + av_assert1(ret >= 0); // buf_size is bounded by UNESCAPED_THRESHOLD + switch (vpc->prev_start_code) { case VC1_CODE_SEQHDR & 0xFF: ff_vc1_decode_sequence_header(avctx, &vpc->v, &gb);