generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/bink: Chech for malloc failure

Browse Source 
Based on commit 8ab2173ed1
This commit is contained in:
James Almer
2013-02-05 22:34:29 -03:00
parent 5fb5ac7148
commit d92a7870d7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/bink.c
View File

@@ -170,7 +170,7 @@ static void init_lengths(BinkContext *c, int width, int bw)
* *
* @param c decoder context * @param c decoder context
*/ */
static av_cold void init_bundles(BinkContext *c) static av_cold int init_bundles(BinkContext *c)
{ {
int bw, bh, blocks; int bw, bh, blocks;
int i; int i;
@@ -181,8 +181,12 @@ static av_cold void init_bundles(BinkContext *c)
for (i = 0; i < BINKB_NB_SRC; i++) { for (i = 0; i < BINKB_NB_SRC; i++) {
c->bundle[i].data = av_malloc(blocks * 64); c->bundle[i].data = av_malloc(blocks * 64);
if (!c->bundle[i].data)
return AVERROR(ENOMEM);
c->bundle[i].data_end = c->bundle[i].data + blocks * 64; c->bundle[i].data_end = c->bundle[i].data + blocks * 64;
} }
return 0;
} }
/** /**
@@ -1264,7 +1268,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
BinkContext * const c = avctx->priv_data; BinkContext * const c = avctx->priv_data;
static VLC_TYPE table[16 * 128][2]; static VLC_TYPE table[16 * 128][2];
static int binkb_initialised = 0; static int binkb_initialised = 0;
int i; int i, ret;
int flags; int flags;
c->version = avctx->codec_tag >> 24; c->version = avctx->codec_tag >> 24;
@@ -1299,7 +1303,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
ff_dsputil_init(&c->dsp, avctx); ff_dsputil_init(&c->dsp, avctx);
ff_binkdsp_init(&c->bdsp); ff_binkdsp_init(&c->bdsp);
init_bundles(c); if ((ret = init_bundles(c)) < 0) {
free_bundles(c);
return ret;
}
if (c->version == 'b') { if (c->version == 'b') {
if (!binkb_initialised) { if (!binkb_initialised) {