Commit 01dbbd0a authored by Vladimir Dergachev's avatar Vladimir Dergachev Committed by Arpi

This fixes segfaults because of uninitialized s->mbintra_table variable -...

This fixes segfaults because of uninitialized s->mbintra_table variable - patch by Vladimir Dergachev <volodya@mindspring.com>

Originally committed as revision 256 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6fb904ce
......@@ -180,13 +180,13 @@ int MPV_common_init(MpegEncContext *s)
s->coded_block = av_mallocz(y_size);
if (!s->coded_block)
goto fail;
}
/* which mb is a intra block */
s->mbintra_table = av_mallocz(y_size/4);
s->mbintra_table = av_mallocz(s->mb_width * s->mb_height);
if (!s->mbintra_table)
goto fail;
memset(s->mbintra_table, 1, y_size/4);
}
memset(s->mbintra_table, 1, s->mb_width * s->mb_height);
/* default structure is frame */
s->picture_structure = PICT_FRAME;
......@@ -209,7 +209,7 @@ int MPV_common_init(MpegEncContext *s)
if (s->coded_block)
free(s->coded_block);
if (s->mbintra_table)
free(s->mbintra_table);
{ free(s->mbintra_table);s->mbintra_table=NULL; }
if (s->mbskip_table)
free(s->mbskip_table);
for(i=0;i<3;i++) {
......@@ -234,7 +234,7 @@ void MPV_common_end(MpegEncContext *s)
free(s->dc_val[0]);
free(s->ac_val[0]);
free(s->coded_block);
free(s->mbintra_table);
{ free(s->mbintra_table);s->mbintra_table=NULL; }
}
if (s->mbskip_table)
free(s->mbskip_table);
......
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