summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-07-21 00:08:55 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-07-21 12:39:42 +0200
commit8df6884832ec413cf032dfaa45c23b1c7876670c (patch)
tree2387b42cdc1bb060eb30d9f50c9ba8887acba19f /libavcodec
parent508ce5839e0bf78ce8813eb1b38cce0d416a408e (diff)
avcodec/utils: Check close before calling it
Fixes: NULL pointer dereference Fixes: 15733/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IDF_fuzzer-5658616977162240 Reviewed-by: Paul B Mahol <onemda@gmail.com> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 9ff9628f7f..66c68d1cf5 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1024,7 +1024,7 @@ end:
return ret;
free_and_end:
- if (avctx->codec &&
+ if (avctx->codec && avctx->codec->close &&
(codec_init_ok ||
(avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP)))
avctx->codec->close(avctx);