From patchwork Mon Feb 5 11:44:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 46035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp693017pzh; Mon, 5 Feb 2024 03:45:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IEmRSKe2zKr0m9ekXJLl5vPsh/1LJovyurGZeEfoeV9nAd4mIIanT5LKyGgk1keLTsPFax0 X-Received: by 2002:a2e:ba0a:0:b0:2d0:992a:cc5f with SMTP id p10-20020a2eba0a000000b002d0992acc5fmr3479565lja.15.1707133512240; Mon, 05 Feb 2024 03:45:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707133512; cv=none; d=google.com; s=arc-20160816; b=lVIIjHMbOP+tGxeRjQ2/68/iCvRyzgt24xlpVptciDFM/YbgTpgmE8xUR3lKVgvqcn 30kObRSfroCRsFat+t9fSLVG/Ms3RJrXcbHsBGOyTAsbyAL4oyQZRqijFy7T52piyMJi 6g2yXt8QMTYqMp66FiqWndg6Snp9gT66X6ihM0YiEznlJ80aMDvJgeESE6i3ZNVfSN+a i/LbI2D3RbI8NEIsvGhKLuEMRQLN5Apj754Qyjw3JJMWbZps7FsJ0wIaIIT4i46OPnAH ei3XU+pDkSumzTST9nQWYN3O8uBQGteqeQi0VzlZvfyFulIyqynkMpLUN4n9prkPMjdA t89A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=TQjBuKYH8A6pasgZH7LinCLnSIBEfuUWZ6LwbWxyur4=; fh=gQfxtq7Cg+6sjDNcBiAmjNv3SODQj/p8XmXIr8nkeoE=; b=bKOkOlA5Yw8vGA+5J58bVF+9+20bKK17E7z0pd7yJmCtqYZDI0/PF7Gnyk3WSxXLDG vFeq7A6Pf2UOhpwFqH7DpB+sZ8NEah9ckWLhwneHEfNF5JjPhOLnO7h+3yYxlguhbxic c2/t47uZvZxjB9TATnlus4/T6viBfRIW26YovJHpWa6aF9OACK54TQ3rt1Cm2o1ry2/t J8pnUPooOUF5PmsSM7M4HmXH1ejd7k51yj3MPBGchrZNlRojY22eZWFnjVMCoStN0X1G RJphU+gi8VtKTE2aTquOJlzPu1r8ywWZd2iIg9xgxEjd3xErpPxCBtgZGrc9W14ODk3/ 79pQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=BJOQDlhP; 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 X-Forwarded-Encrypted: i=0; AJvYcCU7Z23p1UiKrAqfGqTxc5aV0+1DypSM56EwTgDqNP8G12PmHKkgIfOKdgdiT8Q2l2lifu0jeZpg38DgtMPtn25zgUHY8oHQf5GnCTZrG5GR91kq80VYJ+gdwvGaW1yaZz8vnl294NwuGqKdPr4gpujywgGL3CEAdwMxVntYcbuW/CT4G/fWYcvJP4xO9M9RWI3Qv75yiMm55x9Aoe8dsLHyF7ZiAM4YAypOwEvocy27y826YVcV/09qskuKBCqea6ezCBl3SKoO9mgycbL4Px2I+Dx4ROm+AC02d1UzCwmrSX0A7ORr7dqQ74slePRIR2QUJK6ougolDN0+N2+Ix8zHrNKiSTV1BhPHjYJHp9r4ir3KDixsz1FmMSABG6/5AiEROCBWtEaFT8pdLFBhzsIwKcfrjRY6CovOH51MB3eFvZmIJOVmHvJP0F+NoPZXz0ovqnwI64obZYjke+/DZ/cris9nbZj8PUdrKT3pGfai0NqZ3X29EzpbTOvbAxpTSXnjkQSQ5C6+3dQQYprBVoVOUWiKbUpwQTtWzh/RZ+nX6+UFTTrEMDKejK5QZMLPSRx1wYQpd7zkjrgxv2BVU2NmIXp/vgdG67XXv2CxnaJ6pOkL134k/wp6+HfpE+fsQ1PkZ3Q4dz8ke1tJYvpvC4dGWWbiEjyAApbGvdmzsRufi2GLbwkcnoUrGX5+vjtGRIrlelgFcgaVGvUk473TW8+iCAWZ7I7t7iJtelz4ZNkmb8d6RupjhwCbdgAYwFm6lbyS1d6h3cMTRD7OvVE2Ql0bMlPbzQ+BxBwK9jcZvAmpbje/jxWUviVgsbf1CkEk1dD2C9+GoIaV7ysOTYxRPry7tk1yipBv+Mph2ZQfRGMykLBmDW8znjlyWg1G366z6KZOmY+CnM2iLI0AC4zQX8q8XY1+qm6kDxzprBJ5w4Zj9R+qZayxjLeZx6IvTHv6LJ9Bp7 7pDyzYy6Uva55F/PORZ0OjTmGuPf++zIMgzd4NccncuNPFG5D518vNT5ixkZw7HlRzIhE2tKdr8XXTv1IsWnhc0Vzmu5lHggT6+ebzE2S8XxXprRaI7PexpnZypdyaoLQJmAXP60tWyz5y5Y55KwtBzd2d7j1f4NRWSAYmWDia4V1lPUELcqd4wGW7aQE2eIlHhEC7MZDVjrNmny564GlEK8U27wy7D9o7vzHpORyNNWtY+Ibqz7MUFBu+qdGWQmfctDKz2IauPS5z6opVoZ66sARf6GiGWZ72ug7QvVqR6+cTeHwaaoGlccK+SM/hLCzXlVpDlgek/LtC6e52/tlRFkryQ/9hTTNGSlpovyGUU6T9zA28cVIfLX2Onx+H+1zUHK/zUOLSQvNkXsL5sySK8bDTl+ESGqYw4MEosFzF+l5V7bxVPUXHpg1DO9XpprYVRVfQ8XP6tSeazihQ8xPGVfctshNNaBDhzgBEuQy94V5dN1lP/0GaO3evIFmNjb5HdfCnQSnMMMzYRq4LbPaV/ufwS8XpO992noKDcprV8kg2JHlhanyi/16X1mCuRBsrsPENGFTI2eF/D+BBRT9CAzPAaGL/mi1S1RMw Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b13-20020aa7d48d000000b0055ff1384e15si3480769edr.225.2024.02.05.03.45.11; Mon, 05 Feb 2024 03:45:12 -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=@niedermayer.cc header.s=gm1 header.b=BJOQDlhP; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 43E5668D147; Mon, 5 Feb 2024 13:45:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24D2A68CD88 for ; Mon, 5 Feb 2024 13:45:03 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 528D81C000A for ; Mon, 5 Feb 2024 11:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1707133502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=OO/xEW5Es8pCCpKZ7f1oXrteAWiQe1O6P3ZaS0rebys=; b=BJOQDlhPwnCPomhmaqaINhQN12kyX3MSxFqpHe4NMB3fI2Jxz3aBR4W/PTtueCLzRqps5j ms6M7tikZa/m1NzAQVW0EmOw6x1BEaRFDzGGx2jdovJdj5krrSwKx6KpwsgtDN6XcJwfeW nN5dnepORBvZ4N6jMxknHBfK7AyttJnY5mzIym9jFo8zm+xZNglRwowPYfQmx1vD1+NlEi g/5xd9IRYY7/jc/bRxTtHh1SgnmpnjZhj6g5VYHIdnfFjocgSDO06ySX9dj2l1+v1ISAA6 21K4/r/tPAWEH8dSgoHWEnUiPCxK25QA5nZH7YvoZKtq1i3Zd4ALDIIMUj8UPg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 5 Feb 2024 12:44:58 +0100 Message-Id: <20240205114459.8317-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xpAznn1gBZK1 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); + } +} + 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;