virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vf_removelogo: fix memleak on failure

Browse Source 
Fixes CID751770

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-10 21:29:24 +02:00
parent 8e07800001
commit 6b9e0bf42f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_removelogo.c
View File

@ -318,12 +318,16 @@ static av_cold int init(AVFilterContext *ctx)
for (a = 0; a <= s->max_mask_size; a++) { for (a = 0; a <= s->max_mask_size; a++) {
mask[a] = (int **)av_malloc(sizeof(int *) * ((a * 2) + 1)); mask[a] = (int **)av_malloc(sizeof(int *) * ((a * 2) + 1));
if (!mask[a]) if (!mask[a]) {
av_free(mask);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
for (b = -a; b <= a; b++) { for (b = -a; b <= a; b++) {
mask[a][b + a] = (int *)av_malloc(sizeof(int) * ((a * 2) + 1)); mask[a][b + a] = (int *)av_malloc(sizeof(int) * ((a * 2) + 1));
if (!mask[a][b + a]) if (!mask[a][b + a]) {
av_free(mask);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
for (c = -a; c <= a; c++) { for (c = -a; c <= a; c++) {
if ((b * b) + (c * c) <= (a * a)) /* Circular 0/1 mask. */ if ((b * b) + (c * c) <= (a * a)) /* Circular 0/1 mask. */
mask[a][b + a][c + a] = 1; mask[a][b + a][c + a] = 1;