diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 14:15:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 16:23:36 +0100 |
| commit | 0db579445f5201fe2a341ae6485ac51668254fe7 (patch) | |
| tree | 067730599b4ed4723d1da185bb6f4929c708d3b8 | |
| parent | e3275571c7e27f62eec6ce5b4945c612b1b649b8 (diff) | |
| download | ffmpeg-0db579445f5201fe2a341ae6485ac51668254fe7.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>
(cherry picked from commit df74811cd53e45fcbbd3b77a1c42416816687c5c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 cb51e48433..8919e15e9e 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -297,6 +297,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: @@ -424,8 +430,6 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, } break; default: - w_align = 1; - h_align = 1; break; } |