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 57EE247FB2 for ; Mon, 5 Feb 2024 11:50:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87CE268D145; Mon, 5 Feb 2024 13:50:12 +0200 (EET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2101.outbound.protection.outlook.com [40.92.66.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BDC268C6F3 for ; Mon, 5 Feb 2024 13:50:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dor3akvAoEMUmKA3LbxnosrmiXUlrZSkw+M0ZovYFViiBU7894RUkAeG7bH+EErBdBNINA1vhh2UmrHBlyRXZR3T2okzRGNZc4vC4ElgW3I7e1Weo6/k3O+nEMS2ej548uR8ETMRYcbXqG87Fwo/q8L1rR/N6RgW7kIIxFbe51J4u6pKTEdnn/TnazM83e6aueTOXWIpuvxg0oCkCAcFxVZh2k/kdFpUYJ2zg8AbyQWWIC53bceEhCQ5Vh/SOFGvWm6i81dmwLAMa0JaghC6Ls3vM7YFfc8iRKmywq+8Zz2OA2qfneekle9dS0czoc8V94cXZToHLa8Dp9eGysldIw== 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=LdxaKY9b+RZhXFEJP7CKT0AfdXPBf1L5VXnm/ykh2Cs=; b=J85UgtMM3VV23nWgLq2Hrqx+UyP1sDju8ix0avYcj3sSt5WKP25z/hapQZGNPod/uCFjB5Wcb1giSa6V5ELfSyGS2SEP+i/65F0CNhTlq1wDq8P+RnAHQLQF/f/dqGIyaIOPptSI/8/VWRc6PKXiX355YUylNI3sD/T8jxMeIYTIbyOlOtA8sOtEeMKFYGhbsCWVyhP5zwEuQdj+tMiLXPcj0Jy9UysIhGruWx+jo5n+Wxo5FKpjMIhJeowtT1gIx0fLKKB6/9GRypM6LbVYeOt5MXOgYDStHW+y3n4MwmYZulnguJtOtRmjXRucMp49GYMP+V+BNniEpSIxvZlUAw== 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=LdxaKY9b+RZhXFEJP7CKT0AfdXPBf1L5VXnm/ykh2Cs=; b=HKgvz3oIxEgcwMbG0eLzKw+5UvVcUmx0hyVADNZEU7Jyuxz/9B6qLSf49loc6FUVEmrmXme/TRLkUVQm2L8KALSeP3JcxpPWYWwCTxYXjkOxFh4qOIXzC5OuAfGQ8GQag9pG7spYfKXOIMk8MHh43P4qkyLXMjmXZrr8twAx04f1yBk7arpP0HjxpxLbACQkbZEqBBZ69jaXOCW3uskO/MOugFNB+QbeC9QsPrvqvO8Sfdcjkybmuo90fmcftvmzo2C37KLZCyuZeGSxduk5k7uUjthpajLFlS4dSahv2K7BCmUmzBJCBztnC0cipvhsHYdakajziRcwlNn/iIv7bQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0387.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 11:50:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.032; Mon, 5 Feb 2024 11:50:04 +0000 Message-ID: Date: Mon, 5 Feb 2024 12:51:57 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240205114459.8317-1-michael@niedermayer.cc> From: Andreas Rheinhardt In-Reply-To: <20240205114459.8317-1-michael@niedermayer.cc> X-TMN: [XM9L0OCSR9irvwucRMm/yihZJ3SRc84j+f1z9Rfbaew=] X-ClientProxiedBy: ZR0P278CA0214.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <1fc323e7-fd49-4b73-a0c7-088705bab72b@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0387:EE_ X-MS-Office365-Filtering-Correlation-Id: e20f216f-6ca0-4f58-986b-08dc26409772 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicByOPSJwOf10mei4LWviw7wITk7xCEIf2a6Z9rMqlXdJ2eXcUWnTR+bq40iUVpl8xCb0D1I2wLEbGsg8vZhVKdfiagltWK9alGcjjTlXAp9cU+VKFaZYpqbJ0bxvoZKtpG73S6IImSt43oBRWs5r54LNql9Ma2NuUW5KDhQCgUWV5aIr/7ycnui1U2kMvTU7dX+6nTNfzAGnFAbuWIuP0scDgfXC7wuPrI7dYa+q4Ty+pbu20kN/LJinDfWaS89CyCwOadcpYFihITsM9GmXsJCBWV++dycs4I8kTVB9hDKbXAAojON7DJxSdQOhFLAUO84O+FrjkbcLpj0x1rznRHiaAPEi5RtonuD3SXwsHbjhORFuHVktwV+di7ze8K7hOf5OYFfoTND4TkCoebNKFZFFXTkuWaMXxQkiMg1MJCw/3zTHG8Ytw4qzLjRQxhQhYBdBSgxtf4Cn397YTdODgvlZp7dNQ2xsgVW15Od3wm8r0cEGZUdO7LtSZM6nQUO0Qc209ANNf3BW8ss1qU7GkdqfCD7inalbSziqGfEywh6Fdhtq595oqp5oZEJUXK2QfllzijnGOoVRB9072zkSoqmTNyNGUj72TAHvOXHtMGIpVaKwqg5DIKpBe9wRLMqopc9OZtfcEjV/N8baDpzY7px2p3ADFpeIKYKOZfZ23s2W7jDDNqsm1ux434iUyec2i5M88yXM6oLYED/t0q/VFIdWJ6Mvx0r6qOPE2o9u7vVCg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yhXOMhHizLHKb9aH+pH5mC0W1Zm6VGyJPFGC0s+7IJnEBw53yLERri/mhPDrfZ3TZb+ZKCUnlHGxFuEkDttIVAuDnznG40vzdRI45l8ehGj98YCOQUHos8PzDqzNIwji8woQTw2fzNsqQZC1lNA0QSZFq6AjtdC2UQF91V0b7spJboFzI+Es8eLcs15WDpZ18eyjuJwxZiv2eNpdgwOfBT1j1mi63g9KGWrYlSUkfyjrZCOmkMqrR9EndvQhmu2F7kEL7NDVy2vZhRKLBoIhyrEs8Gx/k8E3j1dWxh2rs5SMyCr24zdhjROmLWaz0HmKWDB6oUi7wYYE3rI0R0cRLb3K64SbUkSNL7ChxgXJkldwXPoMAgtG884DG44g45OTOcXLOIUMeN3k0ePao0mctGiRvqRo6zR6cjdvXj3O75fOgdyWBqTMMrc8J/LkGDCenSRvMGUJcKRk4Gw6sDEutcununW2+s2bn4Z3bMKfrboTbht5HkGFr3kfzAIHGv95qcywg+Znph3A5IcCJBKvXSh4P0jcVqAoAFXzcS+xMVNRQnXtO/2z+jBRW6gMbWhc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UVZNY0N6ZXBUQzZSUEROa081SjNLSmhDZVJYM0dVYTFWOXZ0RXduNDBSalc2?= =?utf-8?B?bHQ2cmRDMHhZSFZKMk84YnIzNkdUdGliL2VIUTZYcjJlUGp5bGxTNm5QUzZM?= =?utf-8?B?cnBoTGFFdG1BVHFpTXNiTit6TzVHTmR1blF6MG5zWGJFNXBhL1FZTTZQT09m?= =?utf-8?B?NFpyeTNZOS8yUUJqdDM1YTk2UFpWampFSlVUNjIxWnBOVFcxTWwwUG9BMlhD?= =?utf-8?B?YVpSTzJ3TGFvV3Z4TjJ4dWxxbFcvTEJDTkpDb0NnbVpDV2gzRzcybGlVWFN0?= =?utf-8?B?dGtvTVViMW9kUkVkZnh0eTdrU2NiTW9JMXYvNktyV05sb2orRi95UmdOTDBS?= =?utf-8?B?UjdGbXcwYnZMK2dpYmFoR29GSDJOL3ppcE1RV2NOZDA5bHVCVUNRckpyRGtl?= =?utf-8?B?ZXE4WmJXaXI3bHFKbkd5R0JMQVBSdWw5bGFycUUzRWhzOTJpWU5XT2ZCaThi?= =?utf-8?B?STgxU212OE1TTFM1UlIzQVM1ZmR3N05OQ01acnNibmxPcWRtMWhrSW1RRXFS?= =?utf-8?B?KzZQd2NKZWdndXRxMXkxbndlTnA4UXJJZEpRR3FyV3dsdUZacEhZUGozUnZ1?= =?utf-8?B?Zklla2d1M01WWUIwcTdPSVYxdDAxSEFrWjBVQUR2SXhFc25UcWFmNDdBbHR6?= =?utf-8?B?MnRHVVNMVVpGTHYzNDVucFc5bFozUXNOSHdqanpZMEFoMVdjS1ZxbWN0TUpt?= =?utf-8?B?V283dXZnd285ZG9aakx3MHZ0U3I0Sy9sN2J1cVZBVC9NUUhNVUw5U01QSWYz?= =?utf-8?B?NHlGbFNrejRGdC85RU0rY0hXVHBONGFWMjNsVFczUEJWdzN4N1FPMmtrZ1h6?= =?utf-8?B?UHZZUFdDYWJUSXllNkdHcngyc1lrRGhWWGJxb2JZbmR0Vkh3eHlIa1l4Sys0?= =?utf-8?B?REtEOHpDaWFyRjhmaXlPV0t5WW56Uk9iV3IxUzVrdWJjV0I4RTdKRmZQTmNp?= =?utf-8?B?c3owNWVUTXpPaHZqWXF0b2RvQ1ErMmk4SmlRZ1pPVWowdHVVc016V1J5aTY3?= =?utf-8?B?eVpYVzljKzNHOGxvZ1lmalZVaExQSDdmNVkyblNSeE5xaE1wTVRBcW1vMkhB?= =?utf-8?B?M2V4Y1ZDc1Z2YTU3eTZndWlNRlNQNDlrRHRiNFN3YXVtb1VvUVU4c3RPRmpq?= =?utf-8?B?WExvUWZtUWZHbkNSSDhxR2N3UVkydWNyY3BraXJ0QWRGT3V0STF2NVdVUlVm?= =?utf-8?B?VktDNFhuK05FT09KNm5JSDRjeVh0R1dTK2I0QUJoOFJDVFFONXJsdmZxQ0Jm?= =?utf-8?B?SzJZRjNPTTIxNjlua29LYkViUWZxN29uamVuL0JyTlBNRldMT1lmWDd4VTVP?= =?utf-8?B?d0t6TElHRDZ2MWhrTTVVUURrdkJSd1puZzIxVG43bGRGRXM3YmJMM0p0eFY1?= =?utf-8?B?WjRmcTVjMko4WXZDam1UWi9jOTI2RzN6eGRNelA0eDZtbllHWVc1YVgxaEhi?= =?utf-8?B?UVpscWJaL1JqT3JhR3NwYi9JVlN1VTRZaDkxbmtHcHVnWVdLQTd4T014bXpw?= =?utf-8?B?cjNpZysyYzU0RlRuc29GTG1LQlpZSVhFQk9tcTIwK2x2Y2YvMmpTdHJidWJU?= =?utf-8?B?eGYydDlPdXZKMFN0YXIzWVlQTzV3dUZvQ045OVVzYTkwendkcFJ1OVg1K1Rm?= =?utf-8?B?V0NNYTg1eVNnKzlSWDluRTRuV1pPUUJNdTZ1UWwvaXlDcFFjWGxUMVBmL1Jv?= =?utf-8?Q?Cs4OFEHL7ywXOfH4UOJw?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e20f216f-6ca0-4f58-986b-08dc26409772 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 11:50:04.3108 (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: PR3P250MB0387 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avfilter/signature_lookup: dont leave uncleared pointers in sll_free() 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 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: Michael Niedermayer: > Signed-off-by: Michael Niedermayer > --- > libavfilter/signature_lookup.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/libavfilter/signature_lookup.c b/libavfilter/signature_lookup.c > index 86dd0c66754..52a97e1bc7e 100644 > --- a/libavfilter/signature_lookup.c > +++ b/libavfilter/signature_lookup.c > @@ -37,6 +37,15 @@ > #define STATUS_END_REACHED 1 > #define STATUS_BEGIN_REACHED 2 > > +static void sll_free(MatchingInfo **sll) > +{ > + while (*sll) { > + MatchingInfo *tmp = *sll; > + *sll = (*sll)->next; > + av_free(tmp); > + } This does not clear the pointers at all. This does (and avoids indirections). static void sll_free(MatchingInfo **sllp) { MatchingInfo *sll = *sllp; *sllp = NULL; while (sll) { MatchingInfo *tmp = sll; sll = sll->next; av_free(tmp); } } > +} > + > static void fill_l1distlut(uint8_t lut[]) > { > int i, j, tmp_i, tmp_j,count; > @@ -520,16 +529,6 @@ static MatchingInfo evaluate_parameters(AVFilterContext *ctx, SignatureContext * > return bestmatch; > } > > -static void sll_free(MatchingInfo *sll) > -{ > - void *tmp; > - while (sll) { > - tmp = sll; > - sll = sll->next; > - av_freep(&tmp); > - } > -} > - > static MatchingInfo lookup_signatures(AVFilterContext *ctx, SignatureContext *sc, StreamContext *first, StreamContext *second, int mode) > { > CoarseSignature *cs, *cs2; > @@ -572,7 +571,7 @@ static MatchingInfo lookup_signatures(AVFilterContext *ctx, SignatureContext *sc > "ratio %f, offset %d, score %d, %d frames matching\n", > bestmatch.first->index, bestmatch.second->index, > bestmatch.framerateratio, bestmatch.offset, bestmatch.score, bestmatch.matchframes); > - sll_free(infos); > + sll_free(&infos); > } > } while (find_next_coarsecandidate(sc, second->coarsesiglist, &cs, &cs2, 0) && !bestmatch.whole); > return bestmatch; _______________________________________________ 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".