virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/svq1enc: Check memory allocations

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-18 21:17:18 +01:00
parent 65b83ce01b
commit 2a3af77284
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/svq1enc.c
View File

@@ -301,6 +301,8 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane,
s->motion_val16[plane] = av_mallocz((s->m.mb_stride * s->motion_val16[plane] = av_mallocz((s->m.mb_stride *
(block_height + 2) + 1) * (block_height + 2) + 1) *
2 * sizeof(int16_t)); 2 * sizeof(int16_t));
if (!s->motion_val8[plane] || !s->motion_val16[plane])
return AVERROR(ENOMEM);
} }
s->m.mb_type = s->mb_type; s->m.mb_type = s->mb_type;
@@ -555,6 +557,12 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx)
s->y_block_height * sizeof(int32_t)); s->y_block_height * sizeof(int32_t));
s->ssd_int8_vs_int16 = ssd_int8_vs_int16_c; s->ssd_int8_vs_int16 = ssd_int8_vs_int16_c;
if (!s->m.me.scratchpad || !s->m.me.map || !s->m.me.score_map ||
!s->mb_type || !s->dummy) {
svq1_encode_end(avctx);
return AVERROR(ENOMEM);
}
if (ARCH_PPC) if (ARCH_PPC)
ff_svq1enc_init_ppc(s); ff_svq1enc_init_ppc(s);
if (ARCH_X86) if (ARCH_X86)
@@ -588,6 +596,8 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
} }
s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 3); s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 3);
} }
if (!s->scratchbuf)
return AVERROR(ENOMEM);
FFSWAP(AVFrame*, s->current_picture, s->last_picture); FFSWAP(AVFrame*, s->current_picture, s->last_picture);