virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

xan: Add some buffer checks

Browse Source
This commit is contained in:
Alex Converse 2011-09-09 16:10:03 -07:00
parent 350f57bd7b
commit 0872bb23b4
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/xan.c
View File

@ -106,6 +106,9 @@ static int xan_huffman_decode(unsigned char *dest, int dest_len,
unsigned char *dest_end = dest + dest_len; unsigned char *dest_end = dest + dest_len;
GetBitContext gb; GetBitContext gb;
if (ptr_len < 0)
return AVERROR_INVALIDDATA;
init_get_bits(&gb, ptr, ptr_len * 8); init_get_bits(&gb, ptr, ptr_len * 8);
while ( val != 0x16 ) { while ( val != 0x16 ) {
@ -245,7 +248,7 @@ static inline void xan_wc3_copy_pixel_run(XanContext *s,
} }
} }
static void xan_wc3_decode_frame(XanContext *s) { static int xan_wc3_decode_frame(XanContext *s) {
int width = s->avctx->width; int width = s->avctx->width;
int height = s->avctx->height; int height = s->avctx->height;
@ -265,14 +268,30 @@ static void xan_wc3_decode_frame(XanContext *s) {
const unsigned char *size_segment; const unsigned char *size_segment;
const unsigned char *vector_segment; const unsigned char *vector_segment;
const unsigned char *imagedata_segment; const unsigned char *imagedata_segment;
int huffman_offset, size_offset, vector_offset, imagedata_offset;
huffman_segment = s->buf + AV_RL16(&s->buf[0]); if (s->size < 8)
size_segment = s->buf + AV_RL16(&s->buf[2]); return AVERROR_INVALIDDATA;
vector_segment = s->buf + AV_RL16(&s->buf[4]);
imagedata_segment = s->buf + AV_RL16(&s->buf[6]);
xan_huffman_decode(opcode_buffer, opcode_buffer_size, huffman_offset = AV_RL16(&s->buf[0]);
huffman_segment, s->size - (huffman_segment - s->buf) ); size_offset = AV_RL16(&s->buf[2]);
vector_offset = AV_RL16(&s->buf[4]);
imagedata_offset = AV_RL16(&s->buf[6]);
if (huffman_offset >= s->size ||
size_offset >= s->size ||
vector_offset >= s->size ||
imagedata_offset >= s->size)
return AVERROR_INVALIDDATA;
huffman_segment = s->buf + huffman_offset;
size_segment = s->buf + size_offset;
vector_segment = s->buf + vector_offset;
imagedata_segment = s->buf + imagedata_offset;
if (xan_huffman_decode(opcode_buffer, opcode_buffer_size,
huffman_segment, s->size - huffman_offset) < 0)
return AVERROR_INVALIDDATA;
if (imagedata_segment[0] == 2) if (imagedata_segment[0] == 2)
xan_unpack(s->buffer2, &imagedata_segment[1], s->buffer2_size); xan_unpack(s->buffer2, &imagedata_segment[1], s->buffer2_size);
@ -358,6 +377,7 @@ static void xan_wc3_decode_frame(XanContext *s) {
y += (x + size) / width; y += (x + size) / width;
x = (x + size) % width; x = (x + size) % width;
} }
return 0;
} }
#if RUNTIME_GAMMA #if RUNTIME_GAMMA
@ -519,7 +539,8 @@ static int xan_decode_frame(AVCodecContext *avctx,
s->buf = buf; s->buf = buf;
s->size = buf_size; s->size = buf_size;
xan_wc3_decode_frame(s); if (xan_wc3_decode_frame(s) < 0)
return AVERROR_INVALIDDATA;
/* release the last frame if it is allocated */ /* release the last frame if it is allocated */
if (s->last_frame.data[0]) if (s->last_frame.data[0])