Commit 6fa73e03 authored by kostya's avatar kostya

Guard against output buffer overflows

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10548 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent bf47c31b
......@@ -173,6 +173,10 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
if (!buf_size)
return 0;
// almost every DPCM variant expands one byte of data into two
if(*data_size/2 < buf_size)
return -1;
switch(avctx->codec->id) {
case CODEC_ID_ROQ_DPCM:
......@@ -256,6 +260,8 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
case CODEC_ID_SOL_DPCM:
in = 0;
if (avctx->codec_tag != 3) {
if(*data_size/4 < buf_size)
return -1;
while (in < buf_size) {
int n1, n2;
n1 = (buf[in] >> 4) & 0xF;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment