diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-28 20:08:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-20 10:59:27 +0100 |
| commit | a0a2bfbfd876571344df2b7fe5fd781791ec02a3 (patch) | |
| tree | d75abcaf13813dce914d2de95df994e9c682eb0d /libavcodec/utils.c | |
| parent | 80a24e88e3db27d3604584069122e359dda4a340 (diff) | |
| download | ffmpeg-a0a2bfbfd876571344df2b7fe5fd781791ec02a3.tar.gz | |
avcodec/utils: Clear dimensions in ff_get_buffer() on failure
Fixes out of array access
Fixes: 482d8f2fd17c9f532b586458a33f267c/asan_heap-oob_4a52b6_7417_1d08d477736d66cdadd833d146bb8bae.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit abee0a1c60612e8638640a8a3738fffb65e16dbf)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d5b01d6d2f..a83b0ba91b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1032,8 +1032,10 @@ end: int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) { int ret = get_buffer_internal(avctx, frame, flags); - if (ret < 0) + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + frame->width = frame->height = 0; + } return ret; } |