har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/signature_lookup: dont leave uncleared pointers in sll_free()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6c504829514333439d15deb5717567fb4bdbbee0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-02-05 12:10:41 +01:00
parent 16bef72c50
commit c5dcf99399
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavfilter/signature_lookup.c
View File

@ -37,6 +37,16 @@
#define STATUS_END_REACHED 1 #define STATUS_END_REACHED 1
#define STATUS_BEGIN_REACHED 2 #define STATUS_BEGIN_REACHED 2
static void sll_free(MatchingInfo **sll)
{
while (*sll) {
MatchingInfo *tmp = *sll;
*sll = tmp->next;
tmp->next = NULL;
av_free(tmp);
}
}
static void fill_l1distlut(uint8_t lut[]) static void fill_l1distlut(uint8_t lut[])
{ {
int i, j, tmp_i, tmp_j,count; int i, j, tmp_i, tmp_j,count;
@ -520,16 +530,6 @@ static MatchingInfo evaluate_parameters(AVFilterContext *ctx, SignatureContext *
return bestmatch; 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) static MatchingInfo lookup_signatures(AVFilterContext *ctx, SignatureContext *sc, StreamContext *first, StreamContext *second, int mode)
{ {
CoarseSignature *cs, *cs2; CoarseSignature *cs, *cs2;
@ -572,7 +572,7 @@ static MatchingInfo lookup_signatures(AVFilterContext *ctx, SignatureContext *sc
"ratio %f, offset %d, score %d, %d frames matching\n", "ratio %f, offset %d, score %d, %d frames matching\n",
bestmatch.first->index, bestmatch.second->index, bestmatch.first->index, bestmatch.second->index,
bestmatch.framerateratio, bestmatch.offset, bestmatch.score, bestmatch.matchframes); 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); } while (find_next_coarsecandidate(sc, second->coarsesiglist, &cs, &cs2, 0) && !bestmatch.whole);
return bestmatch; return bestmatch;