RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264_redundant_pps: Fix memleak in case of errors 

Now the fragment is uninitialized and the input packet freed in case of
errors.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
(cherry picked from commit 40b74abfca)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2018-11-09 06:31:36 +01:00 committed by Andreas Rheinhardt
parent aec8b1fa0b
commit 5db4c91ef5
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/h264_redundant_pps_bsf.c
View File

@ -80,7 +80,7 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
err = ff_cbs_read_packet(ctx->input, au, in);
if (err < 0)
return err;
goto fail;
au_has_sps = 0;
for (i = 0; i < au->nb_units; i++) {
@ -89,11 +89,15 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
if (nal->type == H264_NAL_SPS)
au_has_sps = 1;
if (nal->type == H264_NAL_PPS) {
h264_redundant_pps_fixup_pps(ctx, nal->content);
err = h264_redundant_pps_fixup_pps(ctx, nal->content);
if (err < 0)
goto fail;
if (!au_has_sps) {
av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS "
"at %"PRId64".\n", in->pts);
ff_cbs_delete_unit(ctx->input, au, i);
err = ff_cbs_delete_unit(ctx->input, au, i);
if (err < 0)
goto fail;
}
}
if (nal->type == H264_NAL_SLICE ||
@ -105,17 +109,21 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
err = ff_cbs_write_packet(ctx->output, out, au);
if (err < 0)
return err;
goto fail;
ff_cbs_fragment_uninit(ctx->output, au);
err = av_packet_copy_props(out, in);
if (err < 0)
return err;
goto fail;
err = 0;
fail:
ff_cbs_fragment_uninit(ctx->output, au);
av_packet_free(&in);
if (err < 0)
av_packet_unref(out);
return 0;
return err;
}
static int h264_redundant_pps_init(AVBSFContext *bsf)
@ -138,25 +146,29 @@ static int h264_redundant_pps_init(AVBSFContext *bsf)
err = ff_cbs_read_extradata(ctx->input, au, bsf->par_in);
if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n");
return err;
goto fail;
}
for (i = 0; i < au->nb_units; i++) {
if (au->units[i].type == H264_NAL_PPS)
h264_redundant_pps_fixup_pps(ctx, au->units[i].content);
if (au->units[i].type == H264_NAL_PPS) {
err = h264_redundant_pps_fixup_pps(ctx, au->units[i].content);
if (err < 0)
goto fail;
}
}
ctx->extradata_pic_init_qp = ctx->current_pic_init_qp;
err = ff_cbs_write_extradata(ctx->output, bsf->par_out, au);
if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to write extradata.\n");
return err;
goto fail;
}
ff_cbs_fragment_uninit(ctx->output, au);
}
return 0;
err = 0;
fail:
ff_cbs_fragment_uninit(ctx->output, au);
return err;
}
static void h264_redundant_pps_flush(AVBSFContext *bsf)