Commit 472ea128 authored by Michael Niedermayer's avatar Michael Niedermayer

fix infinite loop (suggested change by rjayne at convera dot com)

fixes bug #1160195

Originally committed as revision 4434 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b7b84107
...@@ -274,6 +274,9 @@ static int cinepak_decode_strip (CinepakContext *s, ...@@ -274,6 +274,9 @@ static int cinepak_decode_strip (CinepakContext *s,
while ((data + 4) <= eod) { while ((data + 4) <= eod) {
chunk_id = BE_16 (&data[0]); chunk_id = BE_16 (&data[0]);
chunk_size = BE_16 (&data[2]) - 4; chunk_size = BE_16 (&data[2]) - 4;
if(chunk_size < 0)
return -1;
data += 4; data += 4;
chunk_size = ((data + chunk_size) > eod) ? (eod - data) : chunk_size; chunk_size = ((data + chunk_size) > eod) ? (eod - data) : chunk_size;
......
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