RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vf_hwmap: Properly free a locally derived device 

Fixes CID 1412853.

(cherry picked from commit a670eea560)
This commit is contained in:
Mark Thompson 2017-06-16 23:11:51 +01:00
parent d984b29b21
commit 70808859dd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_hwmap.c
View File

@ -58,7 +58,7 @@ static int hwmap_config_output(AVFilterLink *outlink)
AVHWFramesContext *hwfc; AVHWFramesContext *hwfc;
AVBufferRef *device; AVBufferRef *device;
const AVPixFmtDescriptor *desc; const AVPixFmtDescriptor *desc;
int err; int err, device_is_derived;
av_log(avctx, AV_LOG_DEBUG, "Configure hwmap %s -> %s.\n", av_log(avctx, AV_LOG_DEBUG, "Configure hwmap %s -> %s.\n",
av_get_pix_fmt_name(inlink->format), av_get_pix_fmt_name(inlink->format),
@ -67,6 +67,7 @@ static int hwmap_config_output(AVFilterLink *outlink)
av_buffer_unref(&ctx->hwframes_ref); av_buffer_unref(&ctx->hwframes_ref);
device = avctx->hw_device_ctx; device = avctx->hw_device_ctx;
device_is_derived = 0;
if (inlink->hw_frames_ctx) { if (inlink->hw_frames_ctx) {
hwfc = (AVHWFramesContext*)inlink->hw_frames_ctx->data; hwfc = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
@ -88,6 +89,7 @@ static int hwmap_config_output(AVFilterLink *outlink)
"device context: %d.\n", err); "device context: %d.\n", err);
goto fail; goto fail;
} }
device_is_derived = 1;
} }
desc = av_pix_fmt_desc_get(outlink->format); desc = av_pix_fmt_desc_get(outlink->format);
@ -242,9 +244,13 @@ static int hwmap_config_output(AVFilterLink *outlink)
outlink->w = inlink->w; outlink->w = inlink->w;
outlink->h = inlink->h; outlink->h = inlink->h;
if (device_is_derived)
av_buffer_unref(&device);
return 0; return 0;
fail: fail:
if (device_is_derived)
av_buffer_unref(&device);
av_buffer_unref(&ctx->hwframes_ref); av_buffer_unref(&ctx->hwframes_ref);
return err; return err;
} }