virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Change buffer size checks to avoid the undefined overflow case.

Browse Source 
Originally committed as revision 19047 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-05-31 10:23:38 +00:00
parent 2fddb91e94
commit dbc53ffc7c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/lcldec.c
View File

@ -87,7 +87,7 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
continue; continue;
} }
if ((mask & (1 << (--maskbit))) == 0) { if ((mask & (1 << (--maskbit))) == 0) {
if (destptr + 4 > destptr_end) if (destptr_end - destptr < 4)
break; break;
memcpy(destptr, srcptr, 4); memcpy(destptr, srcptr, 4);
srclen -= 4; srclen -= 4;
@ -101,7 +101,7 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
ofs &= 0x7ff; ofs &= 0x7ff;
srclen -= 2; srclen -= 2;
cnt *= 4; cnt *= 4;
if (destptr + cnt > destptr_end) { if (destptr_end - destptr < cnt) {
cnt = destptr_end - destptr; cnt = destptr_end - destptr;
} }
for (; cnt > 0; cnt--) { for (; cnt > 0; cnt--) {