diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-29 14:15:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-02 11:14:25 +0100 |
| commit | b92ccfefc3a3d9a43c6de78ea51c080bb22d7ef3 (patch) | |
| tree | 5b5f18c680039db38be492c58f078a5a7ca2832f | |
| parent | 6e45a99a7cc485cb91e23b9760912b964cb1ef6c (diff) | |
| download | ffmpeg-b92ccfefc3a3d9a43c6de78ea51c080bb22d7ef3.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 33ff8e0110..7cceafa3a4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -193,6 +193,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: @@ -293,8 +299,6 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, } break; default: - w_align = 1; - h_align = 1; break; } |