summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-02-08 17:55:41 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-02-08 18:31:04 +0100
commitc03029a835949fc0e68b4c6558ebcdc3ae137087 (patch)
treeff7ca3df9e5976fcc9d66359a6d64db971f9e781
parentdac51d2bbdb04445876dc33785c363a9597cbad2 (diff)
downloadffmpeg-streaming-c03029a835949fc0e68b4c6558ebcdc3ae137087.zip
ffmpeg-streaming-c03029a835949fc0e68b4c6558ebcdc3ae137087.tar.gz
avcodec/h264_slice: Clear ref_counts on redundant slices
Fixes reading freed memory Fixes: 568/clusterfuzz-testcase-6107186067406848 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/h264_slice.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 6b555ab..91a3b25 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1999,8 +1999,10 @@ int ff_h264_queue_decode_slice(H264Context *h, const H2645NAL *nal)
return ret;
// discard redundant pictures
- if (sl->redundant_pic_count > 0)
+ if (sl->redundant_pic_count > 0) {
+ sl->ref_count[0] = sl->ref_count[1] = 0;
return 0;
+ }
if (sl->first_mb_addr == 0 || !h->current_slice) {
if (h->setup_finished) {
OpenPOWER on IntegriCloud