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

Add two extra needed bounds checks 

Originally committed as revision 7777 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2007-01-31 10:29:58 +00:00
parent 801778bc83
commit 5fe9c42ceb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/lzo.c
View File

@ -182,6 +182,8 @@ int lzo1x_decode(void *out, int *outlen, void *in, int *inlen) {
x = GETB(c); x = GETB(c);
if (x < 16) c.error |= LZO_ERROR; if (x < 16) c.error |= LZO_ERROR;
} }
if (c.in > c.in_end)
c.error |= LZO_INPUT_DEPLETED;
while (!c.error) { while (!c.error) {
int cnt, back; int cnt, back;
if (x > 15) { if (x > 15) {
@ -209,6 +211,10 @@ int lzo1x_decode(void *out, int *outlen, void *in, int *inlen) {
cnt = get_len(&c, x, 15); cnt = get_len(&c, x, 15);
copy(&c, cnt + 3); copy(&c, cnt + 3);
x = GETB(c); x = GETB(c);
if (c.in > c.in_end) {
c.error |= LZO_INPUT_DEPLETED;
continue;
}
if (x >> 4) if (x >> 4)
continue; continue;
cnt = 1; cnt = 1;