[FFmpeg-cvslog] avcodec/hevc_ps: Sanity checks for some log2_* values
Michael Niedermayer
git at videolan.org
Wed Feb 25 17:47:27 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 25 15:51:28 2015 +0100| [205b2ba3d677330e023aac2f4bd3f624039256b9] | committer: Michael Niedermayer
avcodec/hevc_ps: Sanity checks for some log2_* values
log2 values which imply numeric overflow are not supported
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=205b2ba3d677330e023aac2f4bd3f624039256b9
---
libavcodec/hevc_ps.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 08fe819..65b3268 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -894,11 +894,30 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
sps->log2_max_trafo_size = log2_diff_max_min_transform_block_size +
sps->log2_min_tb_size;
- if (sps->log2_min_tb_size >= sps->log2_min_cb_size) {
+ if (sps->log2_min_cb_size < 3 || sps->log2_min_cb_size > 30) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid value %d for log2_min_cb_size", sps->log2_min_cb_size);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ if (sps->log2_diff_max_min_coding_block_size > 30) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid value %d for log2_diff_max_min_coding_block_size", sps->log2_diff_max_min_coding_block_size);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
+ if (sps->log2_min_tb_size >= sps->log2_min_cb_size || sps->log2_min_tb_size < 2) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid value for log2_min_tb_size");
ret = AVERROR_INVALIDDATA;
goto err;
}
+
+ if (log2_diff_max_min_transform_block_size < 0 || log2_diff_max_min_transform_block_size > 30) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid value %d for log2_diff_max_min_transform_block_size", log2_diff_max_min_transform_block_size);
+ ret = AVERROR_INVALIDDATA;
+ goto err;
+ }
+
sps->max_transform_hierarchy_depth_inter = get_ue_golomb_long(gb);
sps->max_transform_hierarchy_depth_intra = get_ue_golomb_long(gb);
More information about the ffmpeg-cvslog
mailing list