diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-28 20:08:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 12:40:50 +0100 |
| commit | 95bdbfe85159b0b6f576ae23e2b758a169ea409a (patch) | |
| tree | 562db1c2754dbd9a1b69d03912877bfefc140ed5 | |
| parent | 733510fb65833f3d614804aae6ba0d15fc4d65a8 (diff) | |
| download | ffmpeg-95bdbfe85159b0b6f576ae23e2b758a169ea409a.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>
| -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 71308abee9..fc03e4901d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1038,8 +1038,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; } |