[FFmpeg-cvslog] g2meet: Validate bpp and bitmasks in the display info
Maxim Poliakovski
git at videolan.org
Sun Feb 9 00:02:42 CET 2014
ffmpeg | branch: master | Maxim Poliakovski <max_pole at gmx.de> | Sat Feb 8 23:17:08 2014 +0100| [ae95b2f8103cf0136889884fdf1c4e5136634991] | committer: Michael Niedermayer
g2meet: Validate bpp and bitmasks in the display info
That prevents processing of media files with
incompatible or unsupported settings.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae95b2f8103cf0136889884fdf1c4e5136634991
---
libavcodec/g2meet.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index c2fceda..57befbb 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -645,7 +645,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;
@@ -723,6 +723,25 @@ 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 {
+ av_log(avctx, AV_LOG_ERROR,
+ "Unsupported bpp=%d in the display info!\n", c->bpp);
+ return AVERROR_PATCHWELCOME;
+ }
if (g2m_init_buffers(c)) {
ret = AVERROR(ENOMEM);
goto header_fail;
More information about the ffmpeg-cvslog
mailing list