diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-18 22:23:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-25 03:29:35 +0200 |
| commit | 7d42daeea2df35e26dd4d45c3cce693a4d7a788c (patch) | |
| tree | 95bd434427e7cdf716c2e3519b64598d32e14e98 | |
| parent | 055e5c80ee07bb7911016a552df35ad25f7eebdd (diff) | |
| download | ffmpeg-7d42daeea2df35e26dd4d45c3cce693a4d7a788c.tar.gz | |
vcodec/h2645_parse: Clear buffer padding
Fixes use of uninitialized memory
Fixes: 044100cb22845944988a4bd821ff8074/asan_heap-oob_329927a_1366_c3de34ce9217dac820fbb46171031bbb.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 382a68b0088b06b8df20d0133d767d53d8f161ef)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/h2645_parse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index d2fa5a09de..50837b6742 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -34,7 +34,7 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, { int i, si, di; uint8_t *dst; - int64_t padding = small_padding ? AV_INPUT_BUFFER_PADDING_SIZE : MAX_MBPAIR_SIZE; + int64_t padding = small_padding ? 0 : MAX_MBPAIR_SIZE; nal->skipped_bytes = 0; #define STARTCODE_TEST \ @@ -90,8 +90,8 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length, return length; } - av_fast_malloc(&nal->rbsp_buffer, &nal->rbsp_buffer_size, - length + padding); + av_fast_padded_malloc(&nal->rbsp_buffer, &nal->rbsp_buffer_size, + length + padding); if (!nal->rbsp_buffer) return AVERROR(ENOMEM); |