virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Add sanity check for mthread_inlen, avoids crashes due to invalid reads.

Browse Source 
Originally committed as revision 19042 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-05-31 09:59:46 +00:00
parent 1207c84adb
commit 46adcc27a2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/lcldec.c
View File

@ -190,6 +190,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
case COMP_MSZH: case COMP_MSZH:
if (c->flags & FLAG_MULTITHREAD) { if (c->flags & FLAG_MULTITHREAD) {
mthread_inlen = *(unsigned int*)encoded; mthread_inlen = *(unsigned int*)encoded;
mthread_inlen = FFMIN(mthread_inlen, len - 8);
mthread_outlen = *(unsigned int*)(encoded+4); mthread_outlen = *(unsigned int*)(encoded+4);
mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size); mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size);
@ -236,6 +237,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
if (c->flags & FLAG_MULTITHREAD) { if (c->flags & FLAG_MULTITHREAD) {
int ret; int ret;
mthread_inlen = *(unsigned int*)encoded; mthread_inlen = *(unsigned int*)encoded;
mthread_inlen = FFMIN(mthread_inlen, len - 8);
mthread_outlen = *(unsigned int*)(encoded+4); mthread_outlen = *(unsigned int*)(encoded+4);
mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen); ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen);