RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/g2meet: Check init_get_bits8() return value 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-07 22:50:39 +02:00
parent 43e94d5af4
commit b1b0baa3d6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/g2meet.c
View File

@ -253,7 +253,8 @@ static int jpg_decode_data(JPGContext *c, int width, int height,
return ret; return ret;
jpg_unescape(src, src_size, c->buf, &unesc_size); jpg_unescape(src, src_size, c->buf, &unesc_size);
memset(c->buf + unesc_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(c->buf + unesc_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
init_get_bits8(&gb, c->buf, unesc_size); if((ret = init_get_bits8(&gb, c->buf, unesc_size)) < 0)
return ret;
width = FFALIGN(width, 16); width = FFALIGN(width, 16);
mb_w = width >> 4; mb_w = width >> 4;
@ -317,7 +318,7 @@ static int jpg_decode_data(JPGContext *c, int width, int height,
return 0; return 0;
} }
static void kempf_restore_buf(const uint8_t *src, int len, static int kempf_restore_buf(const uint8_t *src, int len,
uint8_t *dst, int stride, uint8_t *dst, int stride,
const uint8_t *jpeg_tile, int tile_stride, const uint8_t *jpeg_tile, int tile_stride,
int width, int height, int width, int height,
@ -325,8 +326,10 @@ static void kempf_restore_buf(const uint8_t *src, int len,
{ {
GetBitContext gb; GetBitContext gb;
int i, j, nb, col; int i, j, nb, col;
int ret;
init_get_bits8(&gb, src, len); if ((ret = init_get_bits8(&gb, src, len)) < 0)
return ret;
if (npal <= 2) nb = 1; if (npal <= 2) nb = 1;
else if (npal <= 4) nb = 2; else if (npal <= 4) nb = 2;
@ -344,6 +347,8 @@ static void kempf_restore_buf(const uint8_t *src, int len,
memcpy(dst + i * 3, jpeg_tile + i * 3, 3); memcpy(dst + i * 3, jpeg_tile + i * 3, 3);
} }
} }
return 0;
} }
static int kempf_decode_tile(G2MContext *c, int tile_x, int tile_y, static int kempf_decode_tile(G2MContext *c, int tile_x, int tile_y,