From patchwork Sat Dec 11 18:40:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32297 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3357831iog; Sat, 11 Dec 2021 10:41:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwran16PWjUT4B385TjsBo83xlR34Icwg7q+LWrR9bDSHVQG1H4d+Q/tx/pO2RGOHyIi4xM X-Received: by 2002:a17:906:b50:: with SMTP id v16mr32873630ejg.384.1639248114943; Sat, 11 Dec 2021 10:41:54 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r24si10189026ejy.396.2021.12.11.10.41.54; Sat, 11 Dec 2021 10:41:54 -0800 (PST) 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="e9w/Zr1U"; 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 9514768AF5B; Sat, 11 Dec 2021 20:41:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2072.outbound.protection.outlook.com [40.92.89.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF057689BFF for ; Sat, 11 Dec 2021 20:41:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aY/29kBnYoyDqH82/fu0Yc1GoUho1dBf579MslhnzRexUg/lztMDXaZSrGAgRQS+FoImGmKbxtXfu6Fc3iUWUdPLz471sv3ILJDkGg06nl6ZoKV7R8MR7Wfn5LPiNx+VUvJRcAVnZVLQl/uwUuUNgY/Sma6/5flQPo1FkMwuo9M7iTuHlZaqHh1Lcda3qXauE8/hrg5+ETsXzAenrIJDTJLaWD4KBp+55MwVe7FuXM6dJFIYkX7sZWeOxZlL26xcO9V8T5lFzNPxcfK5SjqaUxNjK6OPUa5q5klLPe+UE5y6e72lm0EjmoqcNzOnVH9G2oGqugT3je6YuZt3Ksoazw== 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=fIgJP5sDfD8rqX3H3/KQCgiYRf0SDvIyYzlcuvOxfwk=; b=lHjx9XznPnYcDvNryaeVhK1JpNgSftUVpfmHtVC3DELHCIFt/EDjNvfsgef4YUO8eRGCwkLMUAoxJso8cV52Agp0Bw+n80Yy+/oAYfutDj1IXtbJaGBxtUQdSvFi+ekrejOacGyvKRvq/ofPoejrC1RN4Mo/zSMiV+MQ9w950SQhELNOn5QLry3FyHy6TNoKOEg36GK2HxfyDAJ+DhTGXafm2gw5spYpeRQX6VBjQ0Fe+ZOObWN6azO4M6Os4mtCT7rfh55L49+aIMY6k5HArFepbAUW5CqMw2lEUOfiJb8aRxU54aM7B4+Sn2/8vmyxYP8oc03ZtWAFvca8ZLE/2w== 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=fIgJP5sDfD8rqX3H3/KQCgiYRf0SDvIyYzlcuvOxfwk=; b=e9w/Zr1U99k/4++NBnc8qVtSivgB57+fKZcz087fDQhxNkfKqtpmzalwDlwJMBzVcnb/mitGILnIv9Qbd5zGnJ9NG4yrqSZbw4cACnOZcd3pzG5TtEPtx5vhThr+b0mV8tGSA3zRdX+090azyWkZQ6k3VfrfKjyrVISxM5HMzlC8IWbNiswkjUEGCkzJIPuJ48tJ0XDrEoy5uCfi2zD9rqzn1E3oqEhP87d7Wl5Mj1ZR4q7JuYzZQgzvDMy8EE4vbaDuHvPuD9mODjmtPznrB2OsXhZfUE3kCWRbiSB9vJz/1RPYxiuDurEbBmCJbm7ratUaR771Qyd5eCInZHv58A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.22; Sat, 11 Dec 2021 18:41:01 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Sat, 11 Dec 2021 18:41:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 19:40:22 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [hddV5aRr5plYSdK74nuVXSFOBNjB/yQG] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211211184025.1430779-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d511925c-c165-4b4c-f597-08d9bcd5c78d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWxJUMtMcNsrGqEGMDh6H/uB0hf5azEPmwl3N1DdBcXhEeyr47yAULcBCPBVkqtT07+fcQD4RxVCV3dg5wdL8Zn+vsJB+WZxHq4mYErIDajTHfvU60c1uNe3SAsLpJjPjEopS7wpa7D0re8GgBF4BkxzLLlnhnTY2WJzWpHz7U6PpnuLxwbXGbpV6xT35r+WTwk85E+x4BZ6LOAe6rRTaPbGcMmM1rGRGOg7H9dg9SDPlRdHfwW5scxVPfxZ9iVGyvAyvWjHfZuoQ5wcJQJjw4/Lr31au9+RCQtyn8JXe/AfPpmQpluFuhMDI2NocgWpYQNVdO9xqfZc2Xu7CK4Ia/tTgRVGlz8lOLqqy7jajbyrYaJ7vvAFTMU0moAhtKs50wBvOsJcgJKG8XcxutxaRT0k9rhdwmaPfgbWXponlzHUWepjep70NDGp/JMIPixm3wgpfkLhRf4kGRsNpR0kbaQtytQzkl1DtIHEBFrC43ETvCiziZGjHBXPPbdMu+J3Coyu0fJZObHyM24OnexyjqUtz6elwm1pVOD6jTp02vyo3W2sBVUBzz9ONI1nAamKJxLP2El9iib9V1iTm9fpuUxp640WD8BlTs28UIQqVhvLYAuZfMxYd5Th9oiAYUZEeX/pbj0F5HNZA6hTCULCPElV1KEv57vlKJBTNXRK22kI0LQnmvDB3u4UXSBxayqY7Ebpykt9vHfc0qo46uQ6J7SLl45KZpYBQs= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UNprqbxVHKkgA8rEvGNGyoK97i9f50oh+OLJ/ic+J+f+SXuRxPkl/J7FkDhE7301eEV3+eNhPSy4nvC4mD2oD+3V9MHirTHxt8SCJrrtgafxinjpiAtwMy5dD/iobz7NqmVAuScbroTCUcbSst8GdNpy7ZlUYSIeRxZUMopzEUth3UXjH9bBneyhZAD2fl4idAm2W2Nl53or2fErorbxIhEHWWZJGCc1vnoRpxR9pXikR5hnh6Kz7kiAOOZw/8JtwFBqKjqFrhLBnJKVSQh2QpT06jbMzYwntdgot8TcAY3PLcBfKEM/avRc7vGRqALdzZVKx79hXYU8Y5FAP8se6L8SR9EIwsmUSJjK+qktEuk/wa5OyYdmPkmYrX99YNizwxHvABhc0UBQGMsX3TAKxfyGWW2NnrPjxPCuH5xBD99gYi/es2XNf7Ib6crsq8d8GH6iAthbvTlprPN7y5pb0WRtZ23vDTgzicJtqE+OrFYmAZA5g64dPDOiU1J+QmkQw/lQsyypOy9Qg4n8Y4muPwESpxWNJeWqCMRtnxXJBc3iewN2YI8DklwoiYPYrN79mo+c6gbCQgRThywWlvpWbw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IKhZTPONNsvTNqdULAZAZWgW59EZBsJ2RlN6iXEO62l+HuLnm/EgeKocxVfhpX5YvXFTtlmmJd7YGwqP/+6hqqWvWAcPwZFfIS1nzLdFfdSXCzj1wx6wMpGqCMONbt8nUpKjRkSy8vX+Qfb4ipBJ7uOVrGE/HgERDHHUSRGcifnz7V9C+cg9TFcrqQxf2G23sbiWrZG9Hcswq/UCtD/V07QqI3LxXfTWMWTZatylOHeZhpUxDrsqeaUtgsFowQPaHDJPWoKLidB99MV/I29mutKlrnCcIQ6FGFYFfnrh/LjLsm7tlfXKbBdeOL9hwvMUKsDWKE1OwJ6ZPpSMpUNIAyYLqsDKrt2sOMHmhvf6lWRmv4PhVxWvla40t3cTNKovLxvipof1VOdz4+GxPL+1BtJxM8RrzDv4er4AsZYeZWsEQrc2bciLyPOU9iqfE7xjoCXvDCcKAAwBN06KQeG9D2CzGlVLjJLdrZa0YX/jXWQl5jWiNNF+PfwT/oyTQOj2TTXi+cGDb9CC3UINZmQYqIq3CmQwjgS5QygAg7ltrhwL1JgEUwEqlQ9SmMfrvPFiWa0Qke97K5vlOY2DB6STYUcZOIs9VhGQGA+GelO2qP1fXzERYGp/l2r1I5tmBgZ9egWBcA94hpkjRBNfxp3AgKk6GvJ8rySQyUG0xfi9N0bE/WIALq7vlF0I1JkUhdiU+BZWpMKRYPUuWBVEtFfVw0I/eEGKJX/5MRQYjSoBgOLF/+Tjkhc6sxnyXMzdBtachKTCQFhF9lYraTJJJ7Y9Bo48ZQ1/CLiXfcHEvwxbIdwAS2QmjdSBAED15MiZPaV5bwY/4+/4fGf6Xw2qG3uxV5cZxH0OZH8JhK2licB8kDsQo+uCgvtLk/NZOJ0FML7hb+j3RKCqrBwVJdo3EpghZjeQNd/H6jgrmmeFH55tlCyy9bieVduVb5WB0EbCVJYw7+sBKsxYHnI3ok4bUgcqQQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d511925c-c165-4b4c-f597-08d9bcd5c78d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2021 18:41:01.3379 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 09/12] avcodec/ass: Fix leaks upon ff_ass_add_rect() 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: 0bhEbZil8grp Do this by actually incrementing the counter for the number of rects at the right time. Signed-off-by: Andreas Rheinhardt --- libavcodec/ass.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 907e2d7b88..725e4d42ba 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -118,22 +118,22 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, int readorder, int layer, const char *style, const char *speaker) { + AVSubtitleRect **rects, *rect; char *ass_str; - AVSubtitleRect **rects; rects = av_realloc_array(sub->rects, sub->num_rects+1, sizeof(*sub->rects)); if (!rects) return AVERROR(ENOMEM); sub->rects = rects; - rects[sub->num_rects] = av_mallocz(sizeof(*rects[0])); - if (!rects[sub->num_rects]) + rect = av_mallocz(sizeof(*rect)); + if (!rect) return AVERROR(ENOMEM); - rects[sub->num_rects]->type = SUBTITLE_ASS; + rects[sub->num_rects++] = rect; + rect->type = SUBTITLE_ASS; ass_str = ff_ass_get_dialog(readorder, layer, style, speaker, dialog); if (!ass_str) return AVERROR(ENOMEM); - rects[sub->num_rects]->ass = ass_str; - sub->num_rects++; + rect->ass = ass_str; return 0; }