diff options
| author | Maxim Poliakovski <max_pole@gmx.de> | 2014-02-15 21:09:22 +0100 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2014-02-16 16:32:53 +0100 |
| commit | 77fbc032655534ab82627c982192323f2e0d5f18 (patch) | |
| tree | e91d0aacadf426613ca68be4904b696b76dcfbc0 /libavcodec | |
| parent | f58dcfb32e0f61711cd2a0e36458262ee925a17f (diff) | |
| download | ffmpeg-77fbc032655534ab82627c982192323f2e0d5f18.tar.gz | |
g2meet: validate bpp and bitmasks in the display info
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/g2meet.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 045c2a5b9a..89fafef7b1 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -653,7 +653,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, GetByteContext bc, tbc; int magic; int got_header = 0; - uint32_t chunk_size; + uint32_t chunk_size, r_mask, g_mask, b_mask; int chunk_type, chunk_start; int i; int ret; @@ -728,6 +728,26 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, c->tiles_x = (c->width + c->tile_width - 1) / c->tile_width; c->tiles_y = (c->height + c->tile_height - 1) / c->tile_height; c->bpp = bytestream2_get_byte(&bc); + if (c->bpp == 32) { + if (bytestream2_get_bytes_left(&bc) < 16 || + (chunk_size - 21) < 16 ) { + av_log(avctx, AV_LOG_ERROR, + "Display info: missing bitmasks!\n"); + return AVERROR_INVALIDDATA; + } + r_mask = bytestream2_get_be32(&bc); + g_mask = bytestream2_get_be32(&bc); + b_mask = bytestream2_get_be32(&bc); + if (r_mask != 0xFF0000 || g_mask != 0xFF00 || b_mask != 0xFF) { + av_log(avctx, AV_LOG_ERROR, + "Invalid or unsupported bitmasks: R=%X, G=%X, B=%X\n", + r_mask, g_mask, b_mask); + return AVERROR_PATCHWELCOME; + } + } else { + avpriv_request_sample(avctx, "bpp=%d", c->bpp); + return AVERROR_PATCHWELCOME; + } if (g2m_init_buffers(c)) { ret = AVERROR(ENOMEM); goto header_fail; |