From patchwork Mon Apr 8 20:14:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47958 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3f98:b0:1a7:a0dc:8de5 with SMTP id ay24csp137029pzb; Mon, 8 Apr 2024 13:17:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJiv/cNieyVNMfNyfzZIZ+wx5XPFZWSv7Pr9ZU8EaKjavN6egh6+jepoOBz/Yz1sCO2Gfsk68icVPdCvevtHOg4DvUiM6U2aAF/Q== X-Google-Smtp-Source: AGHT+IHCPez2zyQ/P/9j/YIA2tQz6snKekkSjutLqLyabtmxeJ+0eWVVidV4e4+ivE9AJvapgh9H X-Received: by 2002:ac2:5612:0:b0:513:bf92:79ad with SMTP id v18-20020ac25612000000b00513bf9279admr7435992lfd.45.1712607465300; Mon, 08 Apr 2024 13:17:45 -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 g3-20020a170906394300b00a519d2c0340si3879901eje.302.2024.04.08.13.17.44; Mon, 08 Apr 2024 13:17:45 -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=BPURgCRU; 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 3D14068D41C; Mon, 8 Apr 2024 23:16:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2086.outbound.protection.outlook.com [40.92.89.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F82268D413 for ; Mon, 8 Apr 2024 23:16:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HZItcJCBANhhIdxPvuJ1xmt/bq5OMpt2svYcIUsAY6lCvsk0exfsB9KOE2lf1ziiQ26H0mzNLryQa5aQEpEK82oYXcnZxfHl15Aq63WvLWahUczCD2tEKXvapKW9JXZLZB69AhiMmz8brO2m7bFD6KLCkBcHlUMjF7CguFdA+WbqVNjzVBNuEOoNbmLniAbLdSv/4O3tvREYl2IBOXJDdLRYbu2MwtzTs+iaGMyzdu21WM+zWErysQ9rijl93+HSTnkSqoYdT1rZFL6r5GA6m6LgnL7ZXmuk8seYlXccrN2gGFSVG7z4v8ch9myyCkk/pEDF8IjCuKzzj2YmqldpXQ== 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=O5RL7VVeViaYT2bVecT3hz/o6C55WITsVVeKkETRDf4=; b=i7nDjTOaYcFEJLA4JStKydASbdqwPxIv+knznlabNvYOyQlJ1ReT5xdFmiewPgtntWwXXbQhMeheQMkV4BYdwVQJnzEO0oltcuu5WO90yKgPi6M03E/2l/qvteU5bucYnbIvj5eTyVQOA0+dsZa/1dMvET7NvF4iar0L0dKKC1jUA+zHcxd30GOYUd/Pp67OOC/vuLErrM7ZRJ+3c1MOVtVIRSWSVJZYKvPqxbT/pVfJxg0424aocFQfxaaBHSzxEPUEI4B1INx2v+d18SsIjRr5d3AQTUbkYkyDzwnyO+VFMOPQjr5+62qt/Z1Ux5et0FzkoBusnYsCLaWJ1v4I8w== 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=O5RL7VVeViaYT2bVecT3hz/o6C55WITsVVeKkETRDf4=; b=BPURgCRUS65UWBoHaPHqnxQjRIyWnN6Bqd5gl5ig2wVexwBIL5UQfw58oSBRGa7PfQOxxNxFBlhBN+hynUFYhgj155WlhxwLzFAiwFbD9x8xbNL3cMMV1Q0K9rjnuqqYqv6SdYxU7q+fYYjpzHohruMKnyjXuylx7bzRMJHGVFUAJiodjfzwmaqeEb3GZo3tI48//c0zvyZ+Am1WnBoGBY51izlqps2sYh4N+v15V/piVRqDT4mT+Hnrb3BqSPou/758QMCatCzOetoRUkrqbI0nuaHnTf2HmoUiR9NKevg8QQu7bBEUyWDysAmov0J9Uj3Q9zReQHcgYyo4pMcjeQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0171.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:322::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Mon, 8 Apr 2024 20:16:13 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Mon, 8 Apr 2024 20:16:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 22:14:02 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [RwEXoUQEIN885v/30VXykHfPa0SjO6lT1KDGEo/lUh8=] X-ClientProxiedBy: ZR0P278CA0124.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::21) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240408201405.2136840-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0171:EE_ X-MS-Office365-Filtering-Correlation-Id: c779f5c5-bbee-4626-668b-08dc5808bcdc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eVaMXmZEJJHILhf3Ih+I29wGm0fi/WUtBxkL3ycT2pBDbROztcxar3Nf39o/OFuqoEiuFzhpiECCeasDEwQdqN0ProQ5c9rZJs2LXvfZ+5WbrOWWOpNNOypakt9SF3RqJ0mLmVy1XlQULwZgRVsZmIyezEMtgDvHq4xYUCg1upFhNzY6A2cfrTt9rSY/wAilfey5xvl+jY8re1gW7enYWEabc/opD6PhZpxLVwGrNDIqauF8lDz5UgrB4SXIxRjjN3UzgK6rqLpV7/I87zYsua5JeelpcRl7JhYk54PwgwUWNNbPUmX+HdoMZQ7L/HK7tcwJx5AX2r2UO2bxWP8CZpmm3fdAqyTNfnI5UKz3QR+etyMkIVeIuqxGRX7lo1Fyqcwh6wl19W8t3jEtkCPd7Pky4cZwniL5mRsQQqoWDJztuJPnyuXUPYRD7UBlakzxhwDGyODxijkx4LqcO6HAglL0b/nigtQ+D48T7HYvgEMPFgPEeCGR6Y4vtN7RyicbuyseU0r+zBGV9gVjDV3MOdPghHWpOxOsjvssaCTSwUDrvRHDYpb+4G1MAxQEH9EegkCO/ttjRJtL5MT9njjrLjMSBzKG7Qxk1wh19xkHojpHXtia/YJFBztTuCZ8MWDF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DzAErQu4FiZoDohK8P3XCg5e7Dk1K8N/rf5pzr0f0AhPrf6vE2QMRalz44K+FeSp+oCuvVxHaIkI+pjy/sgJArWlwHgztakNXz2rpDniJgFj0OyoWyNv4pptwyLXCzyvYasTh4abU/PKfSDCS/CKtrAb1fD/8XcP4VnvdrmUaUEQtDvwgK2PDK/2tmH/6+a5btD4l66ar4NHGD2JtQG4m7nBhHIRUVE7zpmEBXhWJnWe5XrQRIUZT4Jq7XkD8iyjbUm8LqZ052zYDTH8fuTOTjt3KC/BiKIcAyt9qEVYL9Zk05hXRt9t1i7ag5Igj9ctq9qQPydsPVkw0y1/TWG0LAdAPIB2oXlnETm9wy8LPuKjs43wOJCUfW0n68L+zuBCOCzVD2c5ZOXKz97bCcR5GOyUc/fNe4Z22i64ars0NPW6d5BMUq+zPALuuKrDi0YvZrtSX0JusDaWy8L0uEVMJfGV39oQ9iaHTV7IjRitrPIwdx5ulW/0HUMpOWv73+DySSVn1H/RtX0IqGZVQGE096ts1+nmmXMuhZx/WwBOha13QkYRVIAsJpJXEfjwX7y7m0fJ4LaMCDoHfp5U7M3ltxQ5Z1d73qFHVW/OweXz0pCWUxZ+vcFe7AyHumTM3ltjc+GYN7M0zOkGaqgD8nJXF/My0HPZiOipQih0bUKrz7kpBuzlG1+ywDm4AFEqdpoJ72atlaHxXM8P1IPyl1LcHU/912hhF0RAVzDao44RtCTNtwxN3E+L08RFpbKguFJpTz4toHPPmVysyQZiHn8ZuUfsTR+ks2LovLPnlcI4N3M3U2hxzDyu7nz/BH51JBi6zMroBaZ0tjhXofFcB8YmEi6OVtHr1WBWrUvnsyR4q5sUtPfRIm7kbdRMIBcVc3TcfJIeNNQEpDjevsYrHNwMpJ3gkp28dgWGaFl4uKtivjXRCenZRlQWpcFOTZ0P1viSCt4uowq4yIENQSfi5QDjmWsGjcZRMJMstFMp0SzEyWQb62zHHHdI8eMmfH24T9i73//oKrQuNlBtSFElx4bYw6OrKKZjiz4wXy+LylnKMAOoXNNTqlvCoTiSOdWXfFOkx0g91Brmc91+NGsRl9TMt4+p6gfMzllLuQ9xTyBXS9HuFjECDHJpNevN+lAcMxDK1HAM0/KRVEVI6TMs0+QdagcJlOwgQilUzVPTXGSxLmItou9p2pDoRexq3h8Ey0S3eNMwXrhzmUOJoDlNnAwTmQPZl8ibOyoO3DcIwOPFb8BQqeEFNNCDnhnbLMyymqsMgWi+J+oO4qnn8DGnBvEUOw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c779f5c5-bbee-4626-668b-08dc5808bcdc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2024 20:16:13.3370 (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: AM8P250MB0171 Subject: [FFmpeg-devel] [PATCH v2 24/27] 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: cPsMrVvaQnHR 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 6889545b20..4e14d09c7c 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -450,6 +450,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;