Message ID | GV1P250MB073793EF0071C40240D881C08FE02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp299310pzb; Sat, 11 May 2024 13:58:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXLyfuNMx0n+Oba3zsAZvoSvlf+MjkeeZO9H2TufuiomhHCkKUEerA9Jo092DQedVr5qJ1alruD5QeITLLUsAGtVlyn4/WqIb+XYw== X-Google-Smtp-Source: AGHT+IFZncL3z/cKy7mQB0aUdo6koZXsv8mKn0JnnOV3dcn5T7q7rFr/c7CulWogA785ldp0coOH X-Received: by 2002:a17:906:553:b0:a59:f380:1821 with SMTP id a640c23a62f3a-a5a2d679867mr383948066b.69.1715461097109; Sat, 11 May 2024 13:58:17 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17b21e3esi354431166b.316.2024.05.11.13.58.16; Sat, 11 May 2024 13:58:17 -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=Bn4Mb7Q0; 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 CEA4068D78E; Sat, 11 May 2024 23:54:48 +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-db3eur04olkn2030.outbound.protection.outlook.com [40.92.74.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A48768D778 for <ffmpeg-devel@ffmpeg.org>; Sat, 11 May 2024 23:54:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dkfc3jLWc7yfQerML0vPMkQhn8qK7DZYNvE4/19FvICDNpVQRoMI5aDN9ljCPxT1kcKenTsHXzdWd4UxkMipmtJW+DOW3b+vdjwO6Sw3gVF/rhm3QtaUiXsjulIlc7eymKZlm1Q3XOYEo9XpI5U1EP0od01yvLt9k10PRRjY33E3I+0dY+ykGkEL7RxZYn4CnvOSPpIbRbed+5Ns4542hQosUj765auc1MkLWYw9ERiDC1hLwlC8cm5YiZvR9EZ+PW8E8YmsSh1hB5+scgiNz3gmTpzZeu9jKagWg926fGHoG5tWHZD3Ec3Nb3zzsh0rjm3B+lemYCJP9U4TYq3zdA== 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=hv8tsVcr2eesAn43yxfSJFytzjOM60rJ9DHrLgvJO0c=; b=lLMXdpYFVpe4nqvgzr5XvGxQcOm1yIMlCFHRmf5V4LMLTmudbTF5fhnWZq+kfRtVw0zDabISICehscrLcKwHoTN6RvBJHw1T+VdbndobQ77RZ7U2WhlRHPD5zsQAohpN2aSxg/8oxHI6ol5DioYz6IrX0OyKfc/EqlUES6l0ApG/CakfFMTwIA0w7s8vpS6/cxO9ah3KyJBLywTC7tTMJnVCt0Zze4eEmi/oKefSkAljGzHhVdrdTZsgt2R39BKI/Q+l6wf75T9Ni6dvR0jRP6e0xN+JDTTJ9X4yi1CqyTM6y4TgbkgwTZ+tvsPLHJigXvvUmkpbU/hnJFYRvuqICQ== 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=hv8tsVcr2eesAn43yxfSJFytzjOM60rJ9DHrLgvJO0c=; b=Bn4Mb7Q0E0MNHStYCXYscyQWEpoZLR9FxmH3ci70M5Y+JVabQQBXvqiqT+hpMWp/p+E/ZqgeDzvA7al60QEEVSGcCGAZIp55ERq3eELjqlVpGYdv7Ygst0bzKHm885N+iTVBqBl5XH5YGoDJ4dYRy/iwRwTBjoJPFd10SCspGPeh0DbAbfo9sX24D9Vr8T7EB6uhA4AmrdQNU+A0bQhmfH3u8Th+mnl2l8XNpYovIEc2PUlUyBBnhH2d4vNUrnqAJcvrOpUxWCTZgQO1d5TcGCIWaOqwLVEoNdjM8m2Lzb2g2PaBoysQSqhIMByp9+MHoSERRhGj/q1nnRBFVlX/Vw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0403.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:327::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.54; Sat, 11 May 2024 20:54:42 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:54:42 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:08 +0200 Message-ID: <GV1P250MB073793EF0071C40240D881C08FE02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.40.1 In-Reply-To: <AS8P250MB074471DDEA29072B2586F0EF8FE02@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> References: <AS8P250MB074471DDEA29072B2586F0EF8FE02@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-TMN: [m7LaIJ+bCvh6xBiT9cCjNWHnm4py/tO4glUcbOmMdo8=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-43-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0403:EE_ X-MS-Office365-Filtering-Correlation-Id: 366fd0ef-5e8b-4c53-d6b6-08dc71fc9498 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: wztHg2NCSJPWsBFAGbVrHpVkFEnAwmixaTkCEtPdFsgVATNSREhImTBM7RV/U2cFWOdoWMi38E15iPY5DOn8HbKP1+QASMhi7xX2SOv5ocS1RZoENJeehaG+gLqDQF/ygLb470R7zUuANiyNkBl+0F+DxYM9kLa8tT3N4RzUUsfvbg1QsnhcDnUQVqN1r7KEYsqxcXxYxR576cU+mBnCYpOganpgpv+B3R0RlStrhQ5pz69ejWKS5mzrCwHm7zov+g5cv+3lgNCug0m+eyB+DSE0pdbo9n7MHaC9qtCOiPMn2NjVm0/RxqWgucwDDViULhsTW6ko0qM3+Uklwagfz3lQ/rQEuGXdSqK3QfqYtmDxlM93rK0ysBDMD+Ev4+/Y3f9FTecvuJlWdHK5Oh1BNVGnensPLiKPbv2WWTPVQqAFjWIfF8lH5rYu/hxGFNJKg2l08OJnPKN3SYPNbfepsltzZYJIK0DhWqLsJqqoPONVPYMEjwudbTCJUJR1wWMY+qLQSMrSmMr4lb4ErO62VvndLqOWDsf68tZXb6Xdi1/4IV2bFqTfyd+q9PGw63W02VMgm4krznNvwdNd2eiGXkYFjh4aMDRIMBURrDCoVJSmcYJkVndeLPiE/5zhRmbZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xh0Sq9NnD/uHUj96XsbCyUMaTQfcEJZSpiq+irosijDaYRSpqhZyl+QTLjOWl4lk4f0D7t61/lE9JW7Tr8iOQSySAq8SvtR5rCA7GC61575TSdCtZoK+WUg7+nCU1rhFqcNOiapS86KI2nTO0r8h4J+hTzhBdxtwUsBuCv0xJNJQNvQd+GWmghWhUGVuS1KDarBcDhb0kiPGaS20D30YVAerHTWMvdoyJfpLj94ie15e3cqUQJxUgVaEzX2Au12WmwyfFX5GMNVlKH1uTBtqYeWB54z78mUGLiRx3ws8DEsk8vQdh0oOIpD0lCbvb3kRdNFXeQZO5VkhVWQH7hJysMcVzEhOn6BaX6/QgoMe1F2YAaMh2GLzlBy3EkSZ/UunVqGDGKt/3wdn2j0UM2zVuPO/76FJIyMOu3764baU0q3ZF4pb0KMZ48kmmQ9uFzL6WYZWVLlFgfWYr8LhHdgOe2EOTRJtp5vFa/boIr8AqxcQQATFkAT/WXzIRsvYvPjr4wYy7RmTgaKP7tr0B/8SphQ1/RyOwp3JPD+yOrMrgq2sw90Sgg7i/zutgXzYjx8/7+oxuCkNmWzT5l9yddWy+l7uSV6s+hPvhDN5IfDpAAUMj3+of55h/fBbAEpD3ldXmtO7RaWs5jj2O8Je9VcFOiisQXim7WoUJXtMSTqXfwHtyU88XR/H3w0BThwaOuCyChqDribrPRf0AJ/OFSXmWc0u7Qo6z9Xvz4dFYXm+31BnGPiAUqjLY45ZNUmIFYvuMnjpLXcssv+qJk8+ua1DxjHhacQpusYsnC3ncUFCj6q8m8ZXXa8N2gewluzK1LCuoUHqUrMQteYzjl5TaTug3dtwfbo8+rI35HWx8/lgGVfaVTkLA9nLDjX8/K8UZ+Foo7Np6uVCns7DxShomKBjrIP2U8jhoIxBU+NxMUHIY4qU6Tu8oQcyTIingGcsjsbL3Diozz41pUKsWrJYGlIre4MY4Ex17jBBXPiUPWIhTvF45zmFVWzieibXiPJlxM0yvrh4gNkTjWos8QDaEGf6qjZuhIUD2xwuBKcGGMZMPnM9E7SxvViAoFBdNB7pHEaszq7ohjFSJzz759YNhWJTg5HG5PwT72sOpVXJ7iGSciWolhj7fIM/snM2dz/RMl902XnXKQKpFN/9X/znHaICT1vCfnzNiiLhRn8uGx3rmA4L578dz1sjyIdPispE/DJc6SUXMFz2rLrZBlHi1wpz4XczkR+YDIBpRh1Vb/5bxkDstFDw0O36cs7c2E/lAfttzQ18LLc8AqxpBpmOpABjlQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 366fd0ef-5e8b-4c53-d6b6-08dc71fc9498 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:54:42.0954 (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: DB9P250MB0403 Subject: [FFmpeg-devel] [PATCH v2 44/71] avcodec/error_resilience: Deduplicate cleanup code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: Fj7ApG6LWGel |
Series |
[FFmpeg-devel,v2,01/71] avcodec/ratecontrol: Fix double free on error
|
expand
|
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index efbacb8760..66d03987b6 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -948,19 +948,10 @@ void ff_er_frame_end(ERContext *s, int *decode_error_flags) s->ref_index[i] = av_calloc(s->mb_stride * s->mb_height, 4 * sizeof(uint8_t)); s->motion_val_base[i] = av_calloc(size + 4, 2 * sizeof(uint16_t)); if (!s->ref_index[i] || !s->motion_val_base[i]) - break; + goto cleanup; s->cur_pic.ref_index[i] = s->ref_index[i]; s->cur_pic.motion_val[i] = s->motion_val_base[i] + 4; } - if (i < 2) { - for (i = 0; i < 2; i++) { - av_freep(&s->ref_index[i]); - av_freep(&s->motion_val_base[i]); - s->cur_pic.ref_index[i] = NULL; - s->cur_pic.motion_val[i] = NULL; - } - return; - } } if (s->avctx->debug & FF_DEBUG_ER) { @@ -1344,14 +1335,15 @@ void ff_er_frame_end(ERContext *s, int *decode_error_flags) s->mbintra_table[mb_xy] = 1; } + memset(&s->cur_pic, 0, sizeof(ERPicture)); + memset(&s->last_pic, 0, sizeof(ERPicture)); + memset(&s->next_pic, 0, sizeof(ERPicture)); + +cleanup: for (i = 0; i < 2; i++) { av_freep(&s->ref_index[i]); av_freep(&s->motion_val_base[i]); s->cur_pic.ref_index[i] = NULL; s->cur_pic.motion_val[i] = NULL; } - - memset(&s->cur_pic, 0, sizeof(ERPicture)); - memset(&s->last_pic, 0, sizeof(ERPicture)); - memset(&s->next_pic, 0, sizeof(ERPicture)); }
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/error_resilience.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)