aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2024-02-05 12:40:30 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2024-02-12 00:50:46 +0100
commit98ae1ad7cf16bd10a4fa79f676439edc4da7cba6 (patch)
treea07576f94c0cfb6fb7b8bb3c37222debfd187a95
parent6c504829514333439d15deb5717567fb4bdbbee0 (diff)
downloadffmpeg-98ae1ad7cf16bd10a4fa79f676439edc4da7cba6.tar.gz
avfilter/signature_lookup: Do not dereference NULL pointers after malloc failure
Fixes: CID 1403229 Dereference after null check Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavfilter/signature_lookup.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavfilter/signature_lookup.c b/libavfilter/signature_lookup.c
index 3c7006c9d6..ad012ecced 100644
--- a/libavfilter/signature_lookup.c
+++ b/libavfilter/signature_lookup.c
@@ -299,6 +299,11 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont
if (!c->next)
av_log(ctx, AV_LOG_FATAL, "Could not allocate memory");
c = c->next;
+
+ }
+ if (!c) {
+ sll_free(&cands);
+ goto error;
}
c->framerateratio = (i+1.0) / 30;
c->score = hspace[i][j].score;
@@ -315,6 +320,7 @@ static MatchingInfo* get_matching_parameters(AVFilterContext *ctx, SignatureCont
}
}
}
+ error:
for (i = 0; i < MAX_FRAMERATE; i++) {
av_freep(&hspace[i]);
}