diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-29 16:37:09 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-05-02 10:19:37 -0700 |
| commit | 732f9fcfe54fc9a0a7bbce53fe86b38744c2d301 (patch) | |
| tree | d3a6906815af6f71ac49eebacfde12ac918ab337 /libavcodec/h264_ps.c | |
| parent | ac80b812cd177553339467ea12548d71c9ef6865 (diff) | |
| download | ffmpeg-732f9fcfe54fc9a0a7bbce53fe86b38744c2d301.tar.gz | |
h264: additional protection against unsupported size/bitdepth changes.
Fixes crashes in codepaths not covered by original checks.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 354469c9ad..3f53af82a2 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -475,6 +475,9 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length){ if(pps_id >= MAX_PPS_COUNT) { av_log(h->s.avctx, AV_LOG_ERROR, "pps_id (%d) out of range\n", pps_id); return -1; + } else if (h->sps.bit_depth_luma > 10) { + av_log(h->s.avctx, AV_LOG_ERROR, "Unimplemented luma bit depth=%d (max=10)\n", h->sps.bit_depth_luma); + return AVERROR_PATCHWELCOME; } pps= av_mallocz(sizeof(PPS)); |