From patchwork Mon Oct 2 18:13:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44104 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp1574498pzf; Mon, 2 Oct 2023 11:13:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGliUF+HXajPO9nizhJAu1lJjaN2Mhy4yvVzAZnoknpTlAfz8uxJdvtnfkVkBqcVbPYtDbl X-Received: by 2002:aa7:d3c4:0:b0:532:e39b:8c05 with SMTP id o4-20020aa7d3c4000000b00532e39b8c05mr8470941edr.42.1696270383009; Mon, 02 Oct 2023 11:13:03 -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 f13-20020a056402160d00b00533470248casi3752106edv.53.2023.10.02.11.13.02; Mon, 02 Oct 2023 11:13:02 -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=rk5ARh1P; 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 39B6668CC48; Mon, 2 Oct 2023 21:12:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2081.outbound.protection.outlook.com [40.92.59.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B113068CC11 for ; Mon, 2 Oct 2023 21:12:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HAZ2RoME3lZ3+14oyrpf85iqa5gCu223CEjqwtYYhG+vDZfB9mr6L27NgNJRYMBXNLIbOoAvdlubG/nGjajMwfTlPQlvIYjMiK8nBSvcWKbe0dxb99ROqUqTfYiu1K2UGpF0e7xJlVIHUnxP6I0dfvGG162pO7aDDHuz8cK9yWiywWtWe6psmo5xos0oAicEqF6Z5fa1cZzOXAfGsZZIzn2JXiJTjEQgxwjpraKT7KR49dS6Qsv4VixIjefGON0p+yrGV9ictJjjQMPMNL57Juw39Llqq0gd5YkZlSQoi5FkUCfbErXywP5AzgGKn49cSPrnnTBJZfuzZwWBb4a/Tg== 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=QhxOcT3kaNhCiAz/wihMAuSAxd4wjwqXWtkS42AgGYY=; b=gG1QV6U2TuuLZmos57mLe3s9XQwTkh70pIZfB/MohBP5oPJzqHYh6x5V6xZy329ns/Etu4w3x2NO/XFLGEwZhHQUjpdq+FUA1/PxcnSUsj9viFYm2Ur8chCVeJCcrtYnVXxC1UU57ufA6lAC9lMjsXNoTzb2SVC593mLY+8+4wBNaFIriUF0dO2EnhdxIpRphAdIKu2d+IY0wTpQSkhfU4IKugbw00h3+NO9B+eWglADn8Z782WJ8tABXPcF1z2Tqfi12FrsVWGR0K+80Diepz/oU7OIt5ug28r7gkB1Rn6mcnmnF2npoh2sPclMxz28eIzUfDWtpWbz0cq88Jk1gA== 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=QhxOcT3kaNhCiAz/wihMAuSAxd4wjwqXWtkS42AgGYY=; b=rk5ARh1PaAKpYh04bimvHqzyHXnG6pGYLdqslozbee3lOqdYogJMD+mLqd7EArbZk/trlrXjaZRaWCOwq0kIg0Sfr152nFigH0lFscfCTMVECoV9zzHJWgPFafzusfWF/h91Iw/we5gF3wMuDzespeUZHEKrijI8EJa62UOWoVmiF3jUwkg85ZTCBXSrnbTNd8nZO9pks4Q0QWf8+pFXD7cBJ+D4SugMY1WUJndABfhZ1/Wtg8RlepEdgzlhlQ5TAmCItBEVapsQt2gJnUhEAoi3PpKlwZdlCP6y19LF7vKeLbiiGnmaJ1o+L76DxIGf2DhX7zc7k99FArW/vF3xrA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0218.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:379::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.27; Mon, 2 Oct 2023 18:12:43 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Mon, 2 Oct 2023 18:12:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Oct 2023 20:13:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Il7cO0u6f+CfIPDsXupzKzhTqH8eKz8+] X-ClientProxiedBy: ZR0P278CA0087.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231002181338.1030463-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0218:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a2722ef-d07c-4965-9f53-08dbc3732c26 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kvi2XTINHUcDhr/DfZImVEJfm9k7tDI30Y0rmh/CKCcNDm21tFnq1KXZLxE3HGMyCcbJ9P/I8DGWJMfxXxe/co61xM9kum0oWQ2GpV21rI5Ed2XLAmGRI2QfWBA2iMCjFgn9XRDQeIsZTN/OmS8hBzSJ26DFeQo7tHnZuwKR6BCh2V5THjuob2z8pUNMu/2CigRWdvESGF6LS6PnD4zQWbFq+a5L5meFqLtzPOd71znI8iVmuPiVJSaxO6zhQBTuddk0LuJp2VH+BcuSsJllLnf77h1v+/DGqoqZFZMK0rOcZ6/9VJjlZYcJ19JOr2/U2VveSST32JZHqvy8+8IYBZXX2hlXYxYKDIKodBaBN4+ueYisiH2xOW10CkOT/YN90aeFyGQCJ88dOcszUxGLzjXOsUEd0Kw/VLlY5PxVLu/ewVs7BQ+RBZ1xpluDVJFZNWJXyQYAQe/ojkp7oVxV7oEBpmGtrOZQwNb7Duz0i7hsVQpTzNUB8AF2xrj0mjwzho+r2vW1rAGm2apPf/nvptSC5O0d9PN3y3IEvh0oB23mhIaP98NV/oysipiqJm0mgFWFPUH8MKZSB3J4EutRVeveo8wa3IGkkTyBZc6vN1fpOfN3ajzI7qawWwO2hgin X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g70zT13hSqQbkkSR2hI0D6/BznJg/KWW6xfVapali1fZMazyPHmfbdcltSWpuPtDBjr4oP9g31aRBGpBwXCVDD2BgWQPwElpPf9hEMYTnsp2KDZVUWm8ro+p4W8tfnNLyMAua4csvNeIUv3ZogXqCkPhwiehzwmx2+5LNWz842PrALQ3AFHq61v3ttNyoEu1V08BMM7szNO8NQR6uQE2KllT83PNOWr63OOxNZPuxGluCZmfSJgeJJsJ4l1XBLITAWFj/m5+Vv02IbTY831soDw+xNrKiHwN3QLzo+1K/MtsVfPKM8j/146wt9KnaScSavmjeF9qm0/a0uwnlKVatOGM1fofn1n/zr6K35prHMedR+YY0VAxdV+pYClM1FQ0MU1YM/Ur7AwfsyWCdlzW72a8s/lQINMDJWCIByQc6+fCspRVr5X4DPFdfWCLCow2RJNcyM8M9FwZB+U31K0ZOnYwGU86A/CTFQx1Pn390/qpC1jEO4DkjYWDQVw/SUy7yHW1bTwYk0NS5XqVqN2WLIxCoBmfTghZwqWf7tAlQf5HU1qiFkohNA67zAEhV+t0Zq+jqeDgqm9V/C5vsxLPgag7et8U4vvcT/0a1A7dgOKVXepcP3ozOMdUIetYXG9NTBKdCduhN0Yi7nixYfrH/JIFDovPvaAOCrVRweAcLo//BLKmF9LQKY74V8di8HhCyQZbjulfoo2og+QoggcELauVX6l38PvhceGbayx7vYPP8Xm2OQUh5SM8apmbUt6YdZ8kEMIvLfgj3WjuHcH1/y3pJJZCOUzlBZzUtsLlRp0xAsdc9Y9McKQIfyk2xwk7QfY3gdDk1j6soEuZ0rgOAUBKnXlmKOGZme5qK+bs+fSQvR3ThqVK9KFNLbpynPu3PcRqhkTjs/fhPJHqSGh/aEKoP235Zev9rVbCpMV/CY9D8VFnlRhJroCIKdHIA1fVjEqwaBq5RmQIPs+hdE7P3AkZPdIS9rBq914joR6XNN+bBYpHtiaNiPiFUBesO870VGSdUjQmmv7hACkbYbdD4+VLFYuCMq4mxvN/pHBipPMXJexIfBnyio64qqQIj57ouChGB4dsZzP7VIKNswfFJRnoOFsmKzVaoEwr0B7nsqOi89B6riKvPoIxer9HGiGVR8vijiv4KF3/QPcuGV1YHHV0c98xR3D3yrQ/WmkiDPFdkVM36hkCNb8SkjV5hihGXNoyf4xgPWR22jpZPCDNRUUVA8OqReKH3a64rHLSJcJcy+p1xnA9POg847JAOwpJ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a2722ef-d07c-4965-9f53-08dbc3732c26 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 18:12:43.6063 (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: AS8P250MB0218 Subject: [FFmpeg-devel] [PATCH 45/49] avcodec/rkmppdec: Check av_buffer_ref() 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: CW++QmnXtygJ Signed-off-by: Andreas Rheinhardt --- libavcodec/rkmppdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index 2ca368e0a9..4cca65d8fb 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -449,6 +449,10 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame) // MPP decoder needs to be closed only when all frames have been released. framecontext = (RKMPPFrameContext *)framecontextref->data; framecontext->decoder_ref = av_buffer_ref(rk_context->decoder_ref); + if (!framecontext->decoder_ref) { + ret = AVERROR(ENOMEM); + goto fail; + } framecontext->frame = mppframe; frame->data[0] = (uint8_t *)desc;