diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 14:45:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 18:53:11 +0100 |
| commit | 126ee72e47c9d94ec674b96b541c8a921984286e (patch) | |
| tree | aac07f0b94f607e6d4e3ac8c987ae2edd828dc61 /libavcodec | |
| parent | b4ce4f94e781af9d41e557aca3f393bfb93a79cc (diff) | |
| download | ffmpeg-126ee72e47c9d94ec674b96b541c8a921984286e.tar.gz | |
avcodec/utils: Check that the data is complete in avpriv_bprint_to_extradata()
Fixes out of array read
Fixes: asan_heap-oob_4d2250_814_cov_2745172097_JACOsub_capability_tester.jss
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3d5d95db3f5d8e2093e9e19d0c46e86f54ed2a5d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 7391a69611..61bf5675f4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3405,6 +3405,11 @@ int avpriv_bprint_to_extradata(AVCodecContext *avctx, struct AVBPrint *buf) ret = av_bprint_finalize(buf, &str); if (ret < 0) return ret; + if (!av_bprint_is_complete(buf)) { + av_free(str); + return AVERROR(ENOMEM); + } + avctx->extradata = str; /* Note: the string is NUL terminated (so extradata can be read as a * string), but the ending character is not accounted in the size (in |