From patchwork Thu Oct 7 09:31:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30960 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1284195iob; Thu, 7 Oct 2021 02:32:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIJb/WnDtCFfzbpnnwB7Qb3KaY555QWYF2WLsmgb/UZ4A6zKkGAxC9ILOZUBkQcMQgPM/1 X-Received: by 2002:a17:906:5d1:: with SMTP id t17mr4410073ejt.120.1633599130035; Thu, 07 Oct 2021 02:32:10 -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 p23si8876129edw.135.2021.10.07.02.32.09; Thu, 07 Oct 2021 02:32:10 -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=nLfqTAvN; 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 53C8568A3AF; Thu, 7 Oct 2021 12:31:53 +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-oln040092074015.outbound.protection.outlook.com [40.92.74.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EEB868A3AF for ; Thu, 7 Oct 2021 12:31:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QIJrKsvjHKfXmmyTAPF12oQA3PM1YibKr4LonGIYrbWFq8ZF3SATMDEFrig07OlkR2y3ZGc07htYIGn4F9+0gg/T4e9sENJLsfZC2DlVExeiZC8m1FoQ+MdNBlYvAIp1r94+D1Sdb7cEuR4V1aOYpo5jGB9gK9ox8Ofr40I5dEYGniBmW/EpjQMZiMb74kae3bNd7RmH6D05rORf2xjsooV1Wg3sBUOJr5qAcEIYdUnCu5TKzj8e+FsqSn61YKykhSSAygL8Arn22WtNYXFoKDx6L3tFqgyCuTM3JRxYnyCUVezV89PHpzsQkAwHvmDz783MMq/onGOO2Li0OV8G1Q== 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=aAZCvHAFwTJoWosjcYzF5JDCjUgoaHcybDSyq4SnEP8=; b=iFmyLo59Ih1r7zXc43k/bM96PlOXsUzj1L5FpJ5NLYosdE6ZwJpSHOyOQFwyxY7bNASBIGaJE10OZpZiYKUYf50jeEY8WFce69yqgemCtONc62BsyhdIxW+66J+a6RLnOdNHXuO7EW3BmT5SnSr+V+YwmUvLML1c02JP8T1zmLAwJqQrriL3GJuoj7PXJnD+fK8SWqo4JZW22HY6w9dafV7NOJ7zXXwYZmHzHHQaGw/R1IR5ZnYqMd8UyLbvsocrZTfOvMaGD1ROxAd8mMMhWJKQhOm/NRTktV3g2b+FyPwmEHYJRc+lmvP5aBYu+rSXLhk4KmYO9KlLdLqJ/Xt6Gg== 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=aAZCvHAFwTJoWosjcYzF5JDCjUgoaHcybDSyq4SnEP8=; b=nLfqTAvNTa69IoOND2Z+UWjPngyv7fYXl1ew5M5uZxWT5UXz+YDVK49rRzTbOQ+F//p8OwCQHwLWf1QCh+irS54X+BjwNJkdr+YZaKcZRA7/md5kKUKmH/YNTfYY5r2U9QR+oTzgCkIdpw/VPEm4wJpQlsvJUsHA72NLuDZFBaS5/Nh0jkyKLjKYtyGK2Cpjm6CQFG9UAv2WILD3rOpi21pJFdlKuC7BGa/oO9x8JwzXEDVYZPBJk6LMmHcTcfNnz6CkVqlu+Fd87A9tw8DREZwVv1+U9zLt/z0HBf+UDgaBFiA4qZvzKqPZIGFvreV2utCk4f6+YkpcnrlDWo4h1Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6325.eurprd03.prod.outlook.com (2603:10a6:20b:13c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Thu, 7 Oct 2021 09:31:39 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Thu, 7 Oct 2021 09:31:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 11:31:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [yphi9sIH8cmPyOHj7MDpq4c2IftcSmGc] X-ClientProxiedBy: VI1PR07CA0161.eurprd07.prod.outlook.com (2603:10a6:802:16::48) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211007093128.684774-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by VI1PR07CA0161.eurprd07.prod.outlook.com (2603:10a6:802:16::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.16 via Frontend Transport; Thu, 7 Oct 2021 09:31:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a77b1a04-8054-4218-3e9e-08d9897543d7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNX0VAkTI1HkVp+VvoCHfVArPm6el8Vw9k4e2pbr5rQZWWDnR6LTuxbircmJucGZJbdQv+mN+kq5DIeDxBuFHiSmdF5RK/QkaK/ETlNPCmwTm3WXkEfLaQWKCPhtCjuePaRVTsw+neB/CddKWwZT3red5oOoDcGsm9akYuTXUW28fLyCBcMJeA5Hn4VgJILqlxGNgyPXpFNZSDtJar9sm0uJJZBaQxD6ZH+4SGy550P6PcvSGKIZqqq+zjOOQWAH5qPn+wL40MjHwzrqNEjstl+3tKvY5JUZpvE0000QU/V9tJtkDkaTJGit6NBWV/N27xwwkdwPwYnBFLeFNUZjxIRQTlwK0ixIO+kGVCtXvIxAovgtDgeZAxBd+sJ8PT3LJSL2ye7GISJH5OPFtmpUJtDyunpRd+a9UyXXjmWVXeUe5+uxOP3Bb/SRU86jp3kOjU3Sz8djV9jgUJKLPopKuQdUFBKu4vl1Ua5vfntOIuwxGAE+sbljo171XdoecN+g/aopDDE0aC1QT5LhlScTgvTi7zJ/I6K4wYuvoGXsHNHd1k9nA1cmjSIxGRJHKz1HWZqIopFdpK8f/1UhQqQuLWSsDrEURcTcg7I4XRWSBVg+SpKN3tTRGVGyc4x+0dczE+zeGIJc+DuSYQVJFiysXTMW9oooI6zteny2/53PN+twUPeswuGd+S57XsIpeG4Tv787Cu1gctnMmkcEXyKgAtfYE9GTWSANjRI= X-MS-TrafficTypeDiagnostic: AM7PR03MB6325: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VEalXXGOno9DGLdCJmW9JC79FoqroRCNuTkdf4holYSplCeOGPVCKzyZnAzx/ME0eAl9+bR3ARkMeNAKFeNeiMxbeaBrBsagxZrZ/UpUdF8JPM75LUm6Qd50L8VHE64qItmMLVDiGVJQbrN0c7bejpLZtOfltsjNz25iY4O/D9GXeHrWG1jjWbr7rVjPsCgsCGtbdNFtch95FiCPk24mL7/dlDV3oe3JIJZvjWBX9AVYBvAlYFUhs9+HRC8SO+ubj72iuOR2AGvsBJ2kKQqyw1uIpIsAY6wgUqYwrFfBu8+CqxDXUs5Yv9diwFfTCORPEePeS+K1F861SvqCWd2w/joF1PWJncTRdI5ECi/ievj6B1m4Hx+XQDPAsiiagb87ptSvHRNyIabbfJB43rMX5MWtYXnm82gxOy6F+oopsMC1+9rPgLo4Gyuv/pEq2V3s X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yaqOB7zOF/Ayhg7km1N+uTG5K1p1GENrViO9+5B2/rvOjyHNx5Rb7vY/Ukx0A9MlbMuXwE08LMUuLxrXt46wY3VjSi85GxBkw0Un31JEZ4+NKzCdaiYyH11brID6qiQ/yb83QE62oT56Ja5ErDaUJg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a77b1a04-8054-4218-3e9e-08d9897543d7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 09:31:39.5071 (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: AM7PR03MB6325 Subject: [FFmpeg-devel] [PATCH 4/8] avfilter/aeval: Fix leak of expressions upon reallocation 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 520nvlv8RbfF Fix this by switching to av_dynarray_add_nofree() which is more natural anyway because the entries of the array are pointers. Signed-off-by: Andreas Rheinhardt --- libavfilter/aeval.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c index 2dc8bace51..42cfa81325 100644 --- a/libavfilter/aeval.c +++ b/libavfilter/aeval.c @@ -124,11 +124,10 @@ static int parse_channel_expressions(AVFilterContext *ctx, } #define ADD_EXPRESSION(expr_) do { \ - if (!av_dynarray2_add((void **)&eval->expr, &eval->nb_channels, \ - sizeof(*eval->expr), NULL)) { \ - ret = AVERROR(ENOMEM); \ + ret = av_dynarray_add_nofree(&eval->expr, \ + &eval->nb_channels, NULL); \ + if (ret < 0) \ goto end; \ - } \ eval->expr[eval->nb_channels-1] = NULL; \ ret = av_expr_parse(&eval->expr[eval->nb_channels - 1], expr_, \ var_names, func1_names, func1, \