generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/interplayvideo: Check that enough data is available for opcode_0x7/8/D

Browse Source 
Fixes hypothetical use of uninitialized memory, no sample available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-19 00:17:12 +01:00
parent 66875798eb
commit 8eb76217d0
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/interplayvideo.c
View File

@ -197,6 +197,11 @@ static int ipvideo_decode_block_opcode_0x7(IpvideoContext *s, AVFrame *frame)
unsigned char P[2];
unsigned int flags;
if (bytestream2_get_bytes_left(&s->stream_ptr) < 4) {
av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0x7\n");
return AVERROR_INVALIDDATA;
}
/* 2-color encoding */
P[0] = bytestream2_get_byte(&s->stream_ptr);
P[1] = bytestream2_get_byte(&s->stream_ptr);
@ -236,6 +241,11 @@ static int ipvideo_decode_block_opcode_0x8(IpvideoContext *s, AVFrame *frame)
unsigned char P[4];
unsigned int flags = 0;
if (bytestream2_get_bytes_left(&s->stream_ptr) < 12) {
av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0x8\n");
return AVERROR_INVALIDDATA;
}
/* 2-color encoding for each 4x4 quadrant, or 2-color encoding on
* either top and bottom or left and right halves */
P[0] = bytestream2_get_byte(&s->stream_ptr);
@ -477,6 +487,11 @@ static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s, AVFrame *frame)
int y;
unsigned char P[2];
if (bytestream2_get_bytes_left(&s->stream_ptr) < 4) {
av_log(s->avctx, AV_LOG_ERROR, "too little data for opcode 0xD\n");
return AVERROR_INVALIDDATA;
}
/* 4-color block encoding: each 4x4 block is a different color */
for (y = 0; y < 8; y++) {
if (!(y & 3)) {