diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 14:15:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 14:16:54 +0100 |
| commit | df74811cd53e45fcbbd3b77a1c42416816687c5c (patch) | |
| tree | e66984467fd85d2f9d2b5c4c5c5d23ca6f6c1dfa /libavcodec/utils.c | |
| parent | 0c42f47e383fc8e1e351e7d256803ffd2b2837d1 (diff) | |
| download | ffmpeg-df74811cd53e45fcbbd3b77a1c42416816687c5c.tar.gz | |
avcodec/utils: Align dimensions by at least their chroma sub-sampling factors.
Fixes: out of array accesses
Fixes: asan_heap-oob_112c6b3_13_012.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b6ae1c0a7f..4aa0497b07 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -279,6 +279,12 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int i; int w_align = 1; int h_align = 1; + AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->pix_fmt); + + if (desc) { + w_align = 1 << desc->log2_chroma_w; + h_align = 1 << desc->log2_chroma_h; + } switch (s->pix_fmt) { case AV_PIX_FMT_YUV420P: @@ -406,8 +412,6 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, } break; default: - w_align = 1; - h_align = 1; break; } |