highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/diracdec: Check slices malloc and propagate error code

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-10 17:25:05 +01:00
parent 0b52bdfb3b
commit a4d3cf10b2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/diracdec.c
View File

@ -772,7 +772,7 @@ static int decode_lowdelay_slice(AVCodecContext *avctx, void *arg)
* Dirac Specification -> * Dirac Specification ->
* 13.5.1 low_delay_transform_data() * 13.5.1 low_delay_transform_data()
*/ */
static void decode_lowdelay(DiracContext *s) static int decode_lowdelay(DiracContext *s)
{ {
AVCodecContext *avctx = s->avctx; AVCodecContext *avctx = s->avctx;
int slice_x, slice_y, bytes, bufsize; int slice_x, slice_y, bytes, bufsize;
@ -781,6 +781,8 @@ static void decode_lowdelay(DiracContext *s)
int slice_num = 0; int slice_num = 0;
slices = av_mallocz_array(s->lowdelay.num_x, s->lowdelay.num_y * sizeof(struct lowdelay_slice)); slices = av_mallocz_array(s->lowdelay.num_x, s->lowdelay.num_y * sizeof(struct lowdelay_slice));
if (!slices)
return AVERROR(ENOMEM);
align_get_bits(&s->gb); align_get_bits(&s->gb);
/*[DIRAC_STD] 13.5.2 Slices. slice(sx,sy) */ /*[DIRAC_STD] 13.5.2 Slices. slice(sx,sy) */
@ -808,6 +810,7 @@ static void decode_lowdelay(DiracContext *s)
intra_dc_prediction(&s->plane[1].band[0][0]); /* [DIRAC_STD] 13.3 intra_dc_prediction() */ intra_dc_prediction(&s->plane[1].band[0][0]); /* [DIRAC_STD] 13.3 intra_dc_prediction() */
intra_dc_prediction(&s->plane[2].band[0][0]); /* [DIRAC_STD] 13.3 intra_dc_prediction() */ intra_dc_prediction(&s->plane[2].band[0][0]); /* [DIRAC_STD] 13.3 intra_dc_prediction() */
av_free(slices); av_free(slices);
return 0;
} }
static void init_planes(DiracContext *s) static void init_planes(DiracContext *s)
@ -1590,6 +1593,7 @@ static int dirac_decode_frame_internal(DiracContext *s)
{ {
DWTContext d; DWTContext d;
int y, i, comp, dsty; int y, i, comp, dsty;
int ret;
if (s->low_delay) { if (s->low_delay) {
/* [DIRAC_STD] 13.5.1 low_delay_transform_data() */ /* [DIRAC_STD] 13.5.1 low_delay_transform_data() */
@ -1597,8 +1601,10 @@ static int dirac_decode_frame_internal(DiracContext *s)
Plane *p = &s->plane[comp]; Plane *p = &s->plane[comp];
memset(p->idwt_buf, 0, p->idwt_stride * p->idwt_height * sizeof(IDWTELEM)); memset(p->idwt_buf, 0, p->idwt_stride * p->idwt_height * sizeof(IDWTELEM));
} }
if (!s->zero_res) if (!s->zero_res) {
decode_lowdelay(s); if ((ret = decode_lowdelay(s)) < 0)
return ret;
}
} }
for (comp = 0; comp < 3; comp++) { for (comp = 0; comp < 3; comp++) {