generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: check for luma and chroma bit dept being equal

Browse Source 
The decoder assumes a single bit depth for all the planes
while the specification allows different bit depths for luma
and chroma.

Avoid the possible problems described in CVE-2013-2277

CC: libav-stable@libav.org
(cherry picked from commit 4987faee78)

Conflicts:

	libavcodec/h264.c
This commit is contained in:
Luca Barbato
2013-03-04 11:21:08 +01:00
committed by Reinhard Tartler
parent 4852b3aabd
commit 146eac0a0c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@@ -2421,6 +2421,12 @@ static int h264_set_parameter_from_sps(H264Context *h)
if (s->avctx->has_b_frames < 2) if (s->avctx->has_b_frames < 2)
s->avctx->has_b_frames = !s->low_delay; s->avctx->has_b_frames = !s->low_delay;
if (h->sps.bit_depth_luma != h->sps.bit_depth_chroma) {
av_log_missing_feature(s->avctx,
"Different bit depth between chroma and luma", 1);
return AVERROR_PATCHWELCOME;
}
if (s->avctx->bits_per_raw_sample != h->sps.bit_depth_luma || if (s->avctx->bits_per_raw_sample != h->sps.bit_depth_luma ||
h->cur_chroma_format_idc != h->sps.chroma_format_idc) { h->cur_chroma_format_idc != h->sps.chroma_format_idc) {
if (s->avctx->codec && if (s->avctx->codec &&