[FFmpeg-devel,4/6] h264_redundant_pps: Fix memleak in case of errors

Submitted by Andreas Rheinhardt on Nov. 9, 2018, 5:31 a.m.

Details

Message ID 20181109053138.4572-5-andreas.rheinhardt@googlemail.com
State Accepted
Headers show

Commit Message

Andreas Rheinhardt Nov. 9, 2018, 5:31 a.m.
Now the fragment is uninitialized and the input packet freed in case of
errors.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com>
---
 libavcodec/h264_redundant_pps_bsf.c | 46 ++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 17 deletions(-)

Comments

Mark Thompson Nov. 18, 2018, 9:20 p.m.
On 09/11/18 05:31, Andreas Rheinhardt wrote:
> Now the fragment is uninitialized and the input packet freed in case of
> errors.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com>
> ---
>  libavcodec/h264_redundant_pps_bsf.c | 46 ++++++++++++++++++-----------
>  1 file changed, 29 insertions(+), 17 deletions(-)
> 
> diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c
> index cc5a3060f5..79a11c0e30 100644
> --- a/libavcodec/h264_redundant_pps_bsf.c
> +++ b/libavcodec/h264_redundant_pps_bsf.c
> @@ -76,11 +76,11 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
>  
>      err = ff_bsf_get_packet(bsf, &in);
>      if (err < 0)
> -        return err;
> +        goto fail;

Not this one - you only want to call fragment_uninit() if it fails with a fragment in hand.

>  
>      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(ctx, 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)
> @@ -126,11 +134,11 @@ static int h264_redundant_pps_init(AVBSFContext *bsf)
>  
>      err = ff_cbs_init(&ctx->input, AV_CODEC_ID_H264, bsf);
>      if (err < 0)
> -        return err;
> +        goto fail;
>  
>      err = ff_cbs_init(&ctx->output, AV_CODEC_ID_H264, bsf);
>      if (err < 0)
> -        return err;
> +        goto fail;
>  
>      ctx->global_pic_init_qp = 26;
>  
> @@ -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)
> 

Applied with that changed.

Thanks,

- Mark

Patch hide | download patch | download mbox

diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c
index cc5a3060f5..79a11c0e30 100644
--- a/libavcodec/h264_redundant_pps_bsf.c
+++ b/libavcodec/h264_redundant_pps_bsf.c
@@ -76,11 +76,11 @@  static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
 
     err = ff_bsf_get_packet(bsf, &in);
     if (err < 0)
-        return err;
+        goto fail;
 
     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(ctx, 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)
@@ -126,11 +134,11 @@  static int h264_redundant_pps_init(AVBSFContext *bsf)
 
     err = ff_cbs_init(&ctx->input, AV_CODEC_ID_H264, bsf);
     if (err < 0)
-        return err;
+        goto fail;
 
     err = ff_cbs_init(&ctx->output, AV_CODEC_ID_H264, bsf);
     if (err < 0)
-        return err;
+        goto fail;
 
     ctx->global_pic_init_qp = 26;
 
@@ -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)