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

avcodec/libxvid: check for av_malloc*() failures

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-03 23:42:34 +01:00
parent bd12aa2bc5
commit 5c95de150f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libxvid.c
View File

@ -287,6 +287,8 @@ static int xvid_strip_vol_header(AVCodecContext *avctx, AVPacket *pkt,
/* We need to store the header, so extract it */ /* We need to store the header, so extract it */
if (!avctx->extradata) { if (!avctx->extradata) {
avctx->extradata = av_malloc(vo_len); avctx->extradata = av_malloc(vo_len);
if (!avctx->extradata)
return AVERROR(ENOMEM);
memcpy(avctx->extradata, pkt->data, vo_len); memcpy(avctx->extradata, pkt->data, vo_len);
avctx->extradata_size = vo_len; avctx->extradata_size = vo_len;
} }
@ -625,11 +627,19 @@ static av_cold int xvid_encode_init(AVCodecContext *avctx)
if (avctx->intra_matrix) { if (avctx->intra_matrix) {
intra = avctx->intra_matrix; intra = avctx->intra_matrix;
x->intra_matrix = av_malloc(sizeof(unsigned char) * 64); x->intra_matrix = av_malloc(sizeof(unsigned char) * 64);
if (!x->intra_matrix) {
ret = AVERROR(ENOMEM);
goto fail;
}
} else } else
intra = NULL; intra = NULL;
if (avctx->inter_matrix) { if (avctx->inter_matrix) {
inter = avctx->inter_matrix; inter = avctx->inter_matrix;
x->inter_matrix = av_malloc(sizeof(unsigned char) * 64); x->inter_matrix = av_malloc(sizeof(unsigned char) * 64);
if (!x->inter_matrix) {
ret = AVERROR(ENOMEM);
goto fail;
}
} else } else
inter = NULL; inter = NULL;