[FFmpeg-devel] [PATCH 1/2] avcodec/hevc_ps: Check log2_sao_offset_scale_*
Michael Niedermayer
michael at niedermayer.cc
Wed Jan 24 05:34:49 EET 2018
Fixes: 4868/clusterfuzz-testcase-minimized-6236542906400768
Fixes: runtime error: shift exponent 126 is too large for 32-bit type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/hevc_ps.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 4787312cfa..746c96b17e 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -1324,6 +1324,17 @@ static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx,
pps->log2_sao_offset_scale_luma = get_ue_golomb_long(gb);
pps->log2_sao_offset_scale_chroma = get_ue_golomb_long(gb);
+ if ( pps->log2_sao_offset_scale_luma > FFMAX(sps->bit_depth - 10, 0)
+ || pps->log2_sao_offset_scale_chroma > FFMAX(sps->bit_depth_chroma - 10, 0)
+ ) {
+ av_log(avctx, AV_LOG_ERROR,
+ "log2 sao offset scales (%d %d) are invalid\n",
+ pps->log2_sao_offset_scale_luma,
+ pps->log2_sao_offset_scale_chroma
+ );
+ return AVERROR_INVALIDDATA;
+ }
+
return(0);
}
--
2.15.1
More information about the ffmpeg-devel
mailing list