diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-02 15:16:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-18 18:26:01 +0100 |
| commit | 3c8a12be2f67d0f34a9b280e057fcd25260554b8 (patch) | |
| tree | 9fba07264515f20bed88fd0b6c47622583a75ef8 | |
| parent | 0c5f166e6f5a45e88170937cc9e694d4e78e5ce9 (diff) | |
| download | ffmpeg-3c8a12be2f67d0f34a9b280e057fcd25260554b8.tar.gz | |
avcodec/g2meet: fix error returns
Fixes out of array accesses
This should not affect any release
Fixes: 8ab69af9e5a7a7e20fe04cdd25c0d6e7-asan_heap-oob_e72b82_5505_cov_2278389485_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6b53c1aa822e9c92be52a462dd0aef1c2010ce73)
Conflicts:
libavcodec/g2meet.c
| -rw-r--r-- | libavcodec/g2meet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 452cd7c7bb..b83be23bc0 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -709,7 +709,8 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_ERROR, "Unknown compression method %d\n", c->compression); - return AVERROR_PATCHWELCOME; + ret = AVERROR_PATCHWELCOME; + goto header_fail; } c->tile_width = bytestream2_get_be32(&bc); c->tile_height = bytestream2_get_be32(&bc); |