Browse Source

Fix memory leaks on failed ff_h264_decode_init()

During failure conditions ff_h264_decode_init() leaks memory
allocated for nal units.  Found via valgrind.

Valgrind traces: http://pastebin.com/GqTqxs8T

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.11
Dale Curtis Michael Niedermayer 13 years ago
parent
commit
309a931a38
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/h264.c

+ 3
- 1
libavcodec/h264.c View File

@@ -1251,8 +1251,10 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
} }


if (avctx->extradata_size > 0 && avctx->extradata && if (avctx->extradata_size > 0 && avctx->extradata &&
ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size) < 0)
ff_h264_decode_extradata(h, avctx->extradata, avctx->extradata_size) < 0) {
ff_h264_free_context(h);
return -1; return -1;
}


if (h->sps.bitstream_restriction_flag && if (h->sps.bitstream_restriction_flag &&
s->avctx->has_b_frames < h->sps.num_reorder_frames) { s->avctx->has_b_frames < h->sps.num_reorder_frames) {


Loading…
Cancel
Save