avcodec/mpegpicture: Keep ff_mpeg_framesize_alloc() failure state consistent

Fixes: null pointer dereference
Fixes: ff_put_pixels16_sse2.mp4

Found-by: Rafael Dutra <rafael.dutra@cispa.de>
Regression-since: 4b2863ff01
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/362/head
Michael Niedermayer 4 years ago
parent 6cc65d3d67
commit 76cea1d2ce
  1. 5
      libavcodec/mpegpicture.c

@ -79,8 +79,11 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me,
// linesize * interlaced * MBsize // linesize * interlaced * MBsize
// we also use this buffer for encoding in encode_mb_internal() needig an additional 32 lines // we also use this buffer for encoding in encode_mb_internal() needig an additional 32 lines
if (!FF_ALLOCZ_TYPED_ARRAY(sc->edge_emu_buffer, alloc_size * EMU_EDGE_HEIGHT) || if (!FF_ALLOCZ_TYPED_ARRAY(sc->edge_emu_buffer, alloc_size * EMU_EDGE_HEIGHT) ||
!FF_ALLOCZ_TYPED_ARRAY(me->scratchpad, alloc_size * 4 * 16 * 2)) !FF_ALLOCZ_TYPED_ARRAY(me->scratchpad, alloc_size * 4 * 16 * 2)) {
av_freep(&sc->edge_emu_buffer);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
me->temp = me->scratchpad; me->temp = me->scratchpad;
sc->rd_scratchpad = me->scratchpad; sc->rd_scratchpad = me->scratchpad;
sc->b_scratchpad = me->scratchpad; sc->b_scratchpad = me->scratchpad;

Loading…
Cancel
Save