From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0CB1F47640 for ; Fri, 15 Sep 2023 14:46:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 460A268C7EC; Fri, 15 Sep 2023 17:46:33 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2098.outbound.protection.outlook.com [40.92.91.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53DE568C782 for ; Fri, 15 Sep 2023 17:46:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gmd1OJeJL6xgJWVv6Redzn6wXn5fMZNTaEwHqjOA4FfrzPy7Xm0sGVIiIcQdRPoiAQDt706I5IHh051mFPh2/JznGcL3kJBPLX5S8tZRNpbRZYhjaHyJ1njZJyjwqNgRNHZG86Raen3v6ovp6znYNElNUJGCsYwcyS9wVSaTqUGMOCeRAzHolNeKY0Mb1a5KCZ2qhhGUZus8OXSfl4CPKg0ZhUOM/p4ematWV3PSoR2ouDSOXzidFbBNdA/WVp9fE24SiH/2Qqb/d2yNuxvBDGjS2wqilNRW2voa95fUJQ4+SsxlxNSmU6NCyINUSY0l80/UsZmj9M+aXf5GnI5QDw== 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=Jx1HzSsSZVtzbOrSv6E8vdXdKP6aYJTShuwyATjvex0=; b=bJYM9PXBIZGHoC6kZ20YqZI9ei9cPHGHUkSFYBgc+IDAgCqqz0Hnp7yQZi9z4u3oDTKneVRuEcNOqSmZpaJSmEJHdbnaTHRCP3DV4XK4/b8p3g4SR5ZBPhs0sb5FYCKzL9Xcq95TbYHHKNRZ7biC51JweCDVPKXNksDjlDPCPXhmT8OfSzPMnBjtbN2WHTg9Nhu0+UVlPSmgDWFPtLkWOmRblrWSBF3W6FQZLOYT9rru9dbpq0cLI0qoQSBdoXadlBAG+jAXkJB+s7WEu0EtuhJIUrU/Od35ZIA5XuWwLLhOD745po6q7yKAt0Xh52Ao8MPsqJJ5ugbZ5ThhISonTw== 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=Jx1HzSsSZVtzbOrSv6E8vdXdKP6aYJTShuwyATjvex0=; b=YICDx5HsR+0f+fjYDdr4cG12qVJMh+LZvWsCXb9AsRkVwneUDHc4Tp6ZHTnlsAgVCAXZQTaLglYirxxOE7qM0v1iAx2U9e1CgH/cgQphWlDrTw9unDFdxFtwlT1SU3esBdagzhIOIFuWRnYRzsNXPqho+YGFCaSYOeABFxlucIIBWfHYjznu5ozpdzEWwze0MKtFyqkH60xehRsJdTndIb1tgDeV1EriHkQeR2WAmY1Y/ojSuopTzH1CKAupqPGlcTpnWiDm90l2Uo7bs5tPk7qqWeYNwu2ADaoqkpnhA3n9QJBO3JKYe/T8EZ67/5J8C9jYZzEHEuf487vhd7/VPg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0202.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:379::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.21; Fri, 15 Sep 2023 14:46:24 +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.6768.029; Fri, 15 Sep 2023 14:46:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Sep 2023 16:47:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [makbYVBdWFCDzKqFi12RpfeeuYrcNpLL] X-ClientProxiedBy: ZR0P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230915144728.661037-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0202:EE_ X-MS-Office365-Filtering-Correlation-Id: fbd9cf1c-ab72-4e4d-9761-08dbb5fa8858 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZSxpNbltN8UUGcm/wdzaNMmvByNVC/UPXMtuHpxryZNqoP2i7aYOEOVo2j4kigfiE7YH11CjEC1B9NkhN2jg+HSV0k5Q2tkkbp/xMtPBS4Vc7ovbKLsjqPQC8VUfC3L0wIsA0T9TVmirUaVNdMVDJB8l0jKOGfQSpeaYJj3DnMAdn/Qz2htwUc3HI85huwiqPYpDWzda2UUtHIC+OwZj7dLSHCxvcV4xl2hySbyNspbp8Dv+mzG2osLM3CvnBBBH+2tk3rNBakoi3ZdLkOkrpavVpYvKLaKqKyfLk5Z1ARwMpePi0Q3zkO18GLubeX1N+wR6RXo5WoIMYo06Q+TVPBDdhkLeDRLGKsW+7azvviqp8niDkUw89rPBhqpTfIm7EQLUlg7x5KZSYG/gJ5ShdPcbLkK8huvUKQIclqjhXGgdKGJABhRz6fE+vBy03mXCA4yw17ICwblA/x2bsPccVIYMk7ufvbfW9vxl2DhUVg3LZ3TMzlGYGAP8FxybVlSKVD5/Kk4+87b61+Doep6d1WGj7RlxlLRXKxxbozCRuESjUMxvXce+gws3frHw4Q0MFB0f+WXEcK/KwDYQm/q9C8odNmurJE3+ToEefMSLGNE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1cHF7KyBuBC8UeaoBJdT471X38STKzsEo5z3/9h/QnnwvMkx3k4N8Va5zhxW?= =?us-ascii?Q?W8+hUpLoIFxeZor56kzpu+Qm5PYrCUSWijf3uX/m2/LKfElFc4dkZTzNS3bz?= =?us-ascii?Q?iS1QX/PktFjltka1IrTeASmRZ3c47IgxFYHc6mvPZwZyDkgD+OVFxweB9DhV?= =?us-ascii?Q?mMRsXA4fdQm2uzij7MIhHSAHtTym9rAit00QBOAPjsxzBP4jc3g7d66CXF0c?= =?us-ascii?Q?rnn19PQ2jyg3Jh1Yzsjsr1grheiJHPPYi59j4jd6+2UMLWzAP+OFldShu1Ft?= =?us-ascii?Q?JNYatsare6rXdQu1eRj12cC6LRPnXJ3TJqqTj6Ch45xbo57C26/vUoUhxxwu?= =?us-ascii?Q?ICJBhtZRJOVLbmpbhIa3TbjCBH8bs80tQFEbohH/jf7A5Hq2lNdcGL+ZAyH3?= =?us-ascii?Q?uaxcB+xU8BFUuHCSjZSR+IAIgOQvmA5sQ2UvKxsFlZTSmfDcKT6SMx560iav?= =?us-ascii?Q?hswrmaIeKADfyfSCKR7WvrygCn2vG/MurD6wF8eCaVLqnLBa4P725nrh+Djm?= =?us-ascii?Q?vgVbdFGRHP5z63BuoNOIXe0bW9gYXXGZgG55kEeJw4QpBpAb0zKLFZ94WmhZ?= =?us-ascii?Q?ktkaosGvGnSc23LUvFEzPNdWKt3Ab5RW81DFbu63hWIy9NUadFxzavFXA2+v?= =?us-ascii?Q?ZQmBRE38ttOO1X3piBV+tCT3kYnfAB59OTk1you5FIkYUgXA+8+YcgX3pZtG?= =?us-ascii?Q?eqpEeht2F70L1FCW/Ha5lG0UsIx+bYyLm5UQlpb/Rjtx183XZ/2hwNEWRXPY?= =?us-ascii?Q?C+xMz2ytZ1myN8MptA+ocdZR24pz63gjUyCTaBoAqzyT+63AP8YHQhG9XOK6?= =?us-ascii?Q?6krMtS+Ae5fPFuvwVuApz1L+UrSRo77G4LyE2zyxDgv/W6tv7xuqWuCOi6ue?= =?us-ascii?Q?2eX/ICSL2vN42bL0Pt9I1YdbB3iyxPaPyZzM9/O4ltVam+sHvsxAEYr6lDMk?= =?us-ascii?Q?N686091qoELo65Di16VgTEsZ3kQqruK3ZgCMsEAaH1BWpKeEH/TVJ5oFcx/8?= =?us-ascii?Q?3q0rjPvOZSldCdYlTq90HJlAu6IIaH+zwXvoJBeDCItYEwrASGnJqiZZxyc9?= =?us-ascii?Q?Iy4g+HH8vpogoG9IIrPAkE7X+2CD63RuruDqnQdF+2fQzJsMRa7/vMVQybIa?= =?us-ascii?Q?MkvWGhsnTmmnkdHgetoSYjTPCGwkT6IrtpXwXrznIKY7t7HzhNLJB+V2dJ/T?= =?us-ascii?Q?O+tqdJ4ZmLg1WwKFGnSpC1qk7EDMCcZBc1jA7D5Kbs8q6/E4GuAW3J1OuLNy?= =?us-ascii?Q?AzXE/kBf9provo36tmZb?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbd9cf1c-ab72-4e4d-9761-08dbb5fa8858 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2023 14:46:23.9367 (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: AS8P250MB0202 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/vp3: Simplify shuffling frames, fix crash on alloc 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: When decoding non-keyframes, the decoding process expects there to be two reference frames, the last one and the golden one. The existence of the golden one is checked and in case it is there, it is presumed that the last one exists as well. This assumption is wrong in case of memory allocation failure, namely in case the call to ff_thread_ref_frame() that sets the last frame fails. Fix this by actually performing a shuffle without creating new references. This can't fail and has the advantage of fewer implicit allocations. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 5ce1ecfce7..f12bd497b9 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2498,19 +2498,14 @@ static int update_frames(AVCodecContext *avctx) Vp3DecodeContext *s = avctx->priv_data; int ret = 0; - /* shuffle frames (last = current) */ - ff_thread_release_ext_buffer(avctx, &s->last_frame); - ret = ff_thread_ref_frame(&s->last_frame, &s->current_frame); - if (ret < 0) - goto fail; - if (s->keyframe) { ff_thread_release_ext_buffer(avctx, &s->golden_frame); ret = ff_thread_ref_frame(&s->golden_frame, &s->current_frame); } + /* shuffle frames */ + ff_thread_release_ext_buffer(avctx, &s->last_frame); + FFSWAP(ThreadFrame, s->last_frame, s->current_frame); -fail: - ff_thread_release_ext_buffer(avctx, &s->current_frame); return ret; } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".