From patchwork Mon Jul 8 15:58:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50409 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5876068vqv; Mon, 8 Jul 2024 08:59:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUAU238VdUfqhtxV6yMONUbCRtZ4+7cTso2f7fPNATOL64BiEgQFKWs9FiDdowSDSMCO10/uJ0M5aHhSqbx0S+lX37Wlus93UXXqg== X-Google-Smtp-Source: AGHT+IHgbj96iKHVOUJwFcSY0aZu2FplsqSjOY95YsNcVys4zNBl08ypUxjp2h12Nc+biIBc4yAV X-Received: by 2002:a17:906:3989:b0:a77:cd4f:e4f5 with SMTP id a640c23a62f3a-a780b89ca7dmr279766b.68.1720454362374; Mon, 08 Jul 2024 08:59:22 -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 a640c23a62f3a-a780aae1811si5155866b.387.2024.07.08.08.59.21; Mon, 08 Jul 2024 08:59:22 -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=UM8WRuR1; 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 AF07968DB3B; Mon, 8 Jul 2024 18:59:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2046.outbound.protection.outlook.com [40.92.90.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C37568DB57 for ; Mon, 8 Jul 2024 18:59:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JXK5/bb/K4vRMr2sNnlGg2QeEzkk9G3pd/d7ilQUqPol3ZsCVyBsnrZbuCtMEpRq26gipaayC7YkdzI14UNUAY8QScn4r+R2WlqA8ZF/sBrEE5WHNj1rnHHlteD9WpHvV/wC73hkRSLTTd563z3oNaopfTzGegFFIG/dDCsyK0lEpVImdW6ZILYyTrVfj/Ro6XNh1vdhAu0C8kjp5n3OLZ+djQVY/c/f6OVqusqU6mEu4LFPdzMGE714AokQLSLTvjJhxz14poRqUnoGuSJD4LVSA+I+fRUvou0WnlJevNtE03rf3xaAaQkJamDPkWwmvzdJg5fze1qGPeQ6Z0fnRg== 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=ECInAKqn4SX+ZyVQ8N6TvziWkhveep4PVyoImOr2l94=; b=FHXNk+dDUIBlbJL4A0z26nTwpc5H0bOjbIuDIFQ6KJKQB9l7j59b5XaaxalQOjvnWlE7LQ4E4aVICkQjv3XWyVputr7w9WiXr8fGPO9MKmo3t8eD7toDzRItZGhk0Qgw22+N33s02ch+HSaZHXyvuasWjUI18SduK/RiX7DoTr0CTD758G74i1e7WrsoStcPVFW8calN6DGYXp/RLhjS/1PZmF/eGpCk0G3lKkMrgmB7eRPXtZ+BzQuFYu3mKePpsl1HSh//+j2UF59J+5jOOaUTu78rYUWZVY1ehkZsJd1VV8IA9FlEB38OF/yTJs5UWJ/a4xPlp+k9D/GTMdO27A== 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=ECInAKqn4SX+ZyVQ8N6TvziWkhveep4PVyoImOr2l94=; b=UM8WRuR1tFE3ECWDtMvRzBbBGASIhlqi71RON/uzoa/8b4WgT3TGVi85bx9SkhV/QAFvqdJv9q8JYv5Ai8n8v9hITk2m8TWc965Ox9EvcaWdeZHrm+ELLEocZbGVX5dAFPDJ8KdeAQXzJYDViqEeUEhFfckoeEeBMGZ2sXpiZFghc6OZePH9fXYXJdUWMNCLdjYgJuEX/+n0aMeWs6IACh9PLU3NYdolR7JpXYVJyUUQlgjsg5+A6e66JSZ6JI7HJd24ibOPH42tHezLNvcgIVfVsppprEMnBJL9M6XAr/WDPtnSg0UYHyv50iafEi0FPlXagKz3rBMErH82PFlgrw== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PAXP250MB0495.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:28e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.29; Mon, 8 Jul 2024 15:59:06 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::1f36:56b3:1d04:c7a6]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::1f36:56b3:1d04:c7a6%7]) with mapi id 15.20.7741.027; Mon, 8 Jul 2024 15:59:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2024 17:58:56 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [aKHjrmajkvdH5oElHiK0wS42+KyNu2n1xwoDyZMNa3c=] X-ClientProxiedBy: ZR2P278CA0027.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::19) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240708155857.550520-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PAXP250MB0495:EE_ X-MS-Office365-Filtering-Correlation-Id: 0be00c0b-6c88-4f03-ce2e-08dc9f66e53a X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: 7s/1KNtXxIHV1qPYCeNkLebHd+j9YdxoiZwxKjpDfsbc07Msbp8nenyjZwNFqdM/f3fopIjMKYWB75NwtQ7yGc5EMz8oBsp967rhkgmNTyPoN8SiQ5tXNcBCZvPx9yzVkGECm7J8v+ov5bt69HovDJumv5hFi1utYSV/Z3w6sM5b3e56t+g3SL2LJuJLnn4hkV8jCgJ9/hm/TgIdXJYoQ/EaAGOEbawv1GI22E6eV7aiN6teXVs990qs5EID6vROhMZl7Z2pZaKF2kJGu5C3VOyVEwenpYzdZCY6x4knqKNYXDiqp5ppkZKfaXdNVlPDZkY9pm+UD8Y9FKuWXYDjBRfTQR0i8FampPENvEeIH+s+RSiYqQ2JkvD/KJbENyccgBT0iKpIdyKykLhUiNsKDcIxqxQPEfNaVFn3OyX8zrotkDmla0GyYAmZWI41dYRGOpe7zBvg93yedsnjkeVcq+uqJerUgy72c3pX8z4aOts1H8CBa9QeACp5R8XFATarfY4ZCxUpzrMja9d8Y3GWeELx/4XX7URcLy/PWSfV2aPCshPI8XDSR0V2PgDqYWbCd/ufB4ENRixl8eHvYx+Ej3goAtMHGTwrpNaH/u7h35daeiAq85VURuOk3HAnQYVRh4vlpb0dYU8UtoZHzQXCxoShspqaAsvJhMjzXZC7Vp1O3gDi+h7IM/vkMEZx2jNp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i1K94MIOz6jJhLcGhHft38VWrzoJp84ULkz9xnedjGOAufwQNu+VIPvisEijvawTXHbXhzUmHCaRaWzjNo4kbUrVU93EFw7+SAcCwknpZrNBf7+0SIk1Cqbs9Ee6gjFEgAijDzZxeDB8lGr4mgDVlCHvPtfV2E/KyzQlUgDj1Quqzigiq4I6X02OXRZI19HrNphueWKhaLj1chpGq+79qpyPdnArKtdjlkx1SOTuYdZ8zhyTl8gh/44UYAmXJsunwkCMGPGH6ByvxUFt8N0VMAs9mxFqJxOqM4lOEIG4mwVSAsku0gNRLqB0PbFit9Q0RQmPBuqrXs7LqeHad8L1kXBo8s2HyGt0kold8JCTa9shgXNvmgcgP3GRqDodbpV4XhwLGIr+743sJvKAO6fXrZ0/pVc9IKQ/2yePemKRXUB4LMZMVQ1pQaBSMtv59TkNNiq+TCA9d6aca+TNN2c0KLROfdEonLCK5MWxKwaEmB23ZseigVdSrj3kTGA238ozDmFobDB5SLt5RGri5mOC6UIx/AnE/UIMbeJ67w72jNQv2qQ6JUs6FlOksf7oaMUJYeP+nggaNeRc0+5Bem9IO0AQWstLR5u4qa0qrdOwn+HIuM5PzwmsO67xntJ8yIu+KuSsAiIA8tWojW0rbQsQIty3dYyjqOmsnLyj9RK8g3b5AwTUqDskc4kKVTf+XNv1QRkpyFSdoM1nm4bdJR8czgU05QWrQvGCYnhQzrQccj3Vqi+l+Ln78O/d50mq82TMIURfT0jo5ddGr5qyT9gLj+YqqfiRQddTe5Rh/QYrNSBeilZh/wWWCsc+bPqgiocIpZDv0DFcqdInvcn8GbtJXVc54mhp9FISy+Z8ecctJI3lMA7DRNe2XmOp+4yKbbSYE1W99L6CZxq5wWIHbuytqA0VclP+Gd7fwHB5ERcYWKxuGOACwOq5zgdZCPgReWMXSBPBZX3gZRKepVC4IowB3Wz2/A5z1r3ZLpFuEd3gcKWpG3qDBWPQadSKUeVD9yZZHx5JcLJ3UOHtdFO0kHm0oPl13D5Gj6hWsaYVTOakiZmtNEMtPJk/qRns5XEPzfkhi7xQFnaAmAvkiAcKe36UXujzdb9MbHdD1hJ07F09bZnwXm+53TxqZnLFMgCctys4I4DfEOoNMJIASp0vUEg0y6pOTqvViLiSPJTJnDUOWd9tNioYcfsTZnaqIb3ofKSVu24HhdFH7EzHbECGoFbbllwqB7RuZMg1Dl/uY4azqrgPg/hVj2p0pNhCLdeVywic4ZMO5lwZ7jqnr/icVqelgg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0be00c0b-6c88-4f03-ce2e-08dc9f66e53a X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2024 15:59:06.3758 (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: PAXP250MB0495 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/decode: Fix member access within null pointer 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: 75P23kxHKaOx This "works" because the public AVCodecHWConfig is at the beginning of AVCodecHWConfigInternal. Fixes libavcodec/decode.c:1035:61: runtime error: member access within null pointer of type 'const struct AVCodecHWConfigInternal'. Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 791940648d..cdb682cf69 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1023,6 +1023,7 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *avctx, const enum AVPixelFormat *fmt) { const AVPixFmtDescriptor *desc; + const FFCodec *const codec = ffcodec(avctx->codec); const AVCodecHWConfig *config; int i, n; @@ -1031,10 +1032,8 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *avctx, if (avctx->hw_device_ctx && ffcodec(avctx->codec)->hw_configs) { AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data; - for (i = 0;; i++) { - config = &ffcodec(avctx->codec)->hw_configs[i]->public; - if (!config) - break; + for (size_t i = 0; codec->hw_configs[i]; i++) { + config = &codec->hw_configs[i]->public; if (!(config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX)) continue;