History

Merge commit 'e66fa35392cd45d0a80774cd057fb765d60def43'

* commit 'e66fa35392cd45d0a80774cd057fb765d60def43': vc1dec: Check group allocations separatedly

Derek Buitenhuis committed 10 years ago

Commit 3dec7ed2 parents 8cd1323 e66fa351 file · +19 −6Browse files

Unified · Split

libavcodec/vc1dec.c+19−6
@@ -334,31 +334,50 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) · 333 unmodified lines
334334 v->fieldtx_plane = av_mallocz(s->mb_stride * mb_height);
335335 v->acpred_plane = av_malloc (s->mb_stride * mb_height);
336336 v->over_flags_plane = av_malloc (s->mb_stride * mb_height);
337+ if (!v->mv_type_mb_plane || !v->direct_mb_plane || !v->forward_mb_plane ||
338+ !v->fieldtx_plane || !v->acpred_plane || !v->over_flags_plane)
339+ goto error;
337340
338341 v->n_allocated_blks = s->mb_width + 2;
339342 v->block = av_malloc(sizeof(*v->block) * v->n_allocated_blks);
340343 v->cbp_base = av_malloc(sizeof(v->cbp_base[0]) * 2 * s->mb_stride);
344+ if (!v->block || !v->cbp_base)
345+ goto error;
341346 v->cbp = v->cbp_base + s->mb_stride;
342347 v->ttblk_base = av_malloc(sizeof(v->ttblk_base[0]) * 2 * s->mb_stride);
348+ if (!v->ttblk_base)
349+ goto error;
343350 v->ttblk = v->ttblk_base + s->mb_stride;
344351 v->is_intra_base = av_mallocz(sizeof(v->is_intra_base[0]) * 2 * s->mb_stride);
352+ if (!v->is_intra_base)
353+ goto error;
345354 v->is_intra = v->is_intra_base + s->mb_stride;
346355 v->luma_mv_base = av_mallocz(sizeof(v->luma_mv_base[0]) * 2 * s->mb_stride);
356+ if (!v->luma_mv_base)
357+ goto error;
347358 v->luma_mv = v->luma_mv_base + s->mb_stride;
348359
349360 /* allocate block type info in that way so it could be used with s->block_index[] */
350361 v->mb_type_base = av_malloc(s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
362+ if (!v->mb_type_base)
363+ goto error;
351364 v->mb_type[0] = v->mb_type_base + s->b8_stride + 1;
352365 v->mb_type[1] = v->mb_type_base + s->b8_stride * (mb_height * 2 + 1) + s->mb_stride + 1;
353366 v->mb_type[2] = v->mb_type[1] + s->mb_stride * (mb_height + 1);
354367
355368 /* allocate memory to store block level MV info */
356369 v->blk_mv_type_base = av_mallocz( s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
370+ if (!v->blk_mv_type_base)
371+ goto error;
357372 v->blk_mv_type = v->blk_mv_type_base + s->b8_stride + 1;
358373 v->mv_f_base = av_mallocz(2 * (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2));
374+ if (!v->mv_f_base)
375+ goto error;
359376 v->mv_f[0] = v->mv_f_base + s->b8_stride + 1;
360377 v->mv_f[1] = v->mv_f[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
361378 v->mv_f_next_base = av_mallocz(2 * (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2));
379+ if (!v->mv_f_next_base)
380+ goto error;
362381 v->mv_f_next[0] = v->mv_f_next_base + s->b8_stride + 1;
363382 v->mv_f_next[1] = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
364383
@@ -370,12 +389,6 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) · 5 unmodified lines
370389 return AVERROR(ENOMEM);
371390 }
372391
373− if (!v->mv_type_mb_plane || !v->direct_mb_plane || !v->acpred_plane || !v->over_flags_plane ||
374− !v->block || !v->cbp_base || !v->ttblk_base || !v->is_intra_base || !v->luma_mv_base ||
375− !v->mb_type_base) {
376− goto error;
377− }
378−
379392 return 0;
380393
381394 error:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t