diff options
| author | Michael Niedermayer <[email protected]> | 2014-11-25 14:45:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-12-21 04:40:35 +0100 |
| commit | 46dfd59ae1997d0bc6b38dcf19b427b6484f20c0 (patch) | |
| tree | 9cc208b93f8e581b577bc9a8f0a8c76e6a4b9218 | |
| parent | 07b98ea3963f1bf4a94b6adce540af90e767d881 (diff) | |
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 <[email protected]>
(cherry picked from commit 3d5d95db3f5d8e2093e9e19d0c46e86f54ed2a5d)
Signed-off-by: Michael Niedermayer <[email protected]>
| -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 75d785e2c1..6bae2a8e71 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2713,6 +2713,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 |