diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-09-24 23:24:20 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-10-01 12:50:57 +0200 |
| commit | 502c5fe10143247b0566d3d2bb927f49769c2181 (patch) | |
| tree | 54177002c64b797e6fae836b89e82d6889eec870 /libavcodec | |
| parent | 33b4b788aac91dfd522415baaedcbda160482816 (diff) | |
| download | ffmpeg-502c5fe10143247b0566d3d2bb927f49769c2181.tar.gz | |
avcodec/utils: Remove always-true check
The first thing avcodec_open2() allocates is the AVCodecInternal. If
allocating it fails, a jump to end occurs; but if an error happens after
its allocation, a jump to free_and_end happens which frees all
allocations performed so far and then jumps to end. Yet free_and_end
contained a check for AVCodecInternal (after having already dereferenced
it to check whether ff_thread_free() needs to be called) which is of
course always true. So remove it.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 94b9e94584..8e7c3125aa 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1043,7 +1043,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_dict_free(&tmp); av_freep(&avctx->priv_data); av_freep(&avctx->subtitle_header); - if (avci) { + av_frame_free(&avci->to_free); av_frame_free(&avci->compat_decode_frame); av_frame_free(&avci->buffer_frame); @@ -1056,7 +1056,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_bsf_free(&avci->bsf); av_buffer_unref(&avci->pool); - } av_freep(&avci); avctx->internal = NULL; avctx->codec = NULL; |