| Message ID | 1590370532-8386-1-git-send-email-mypopydev@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [FFmpeg-devel] lavfi/afir: fix vpad.name leak | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
typo in commit message. On 5/25/20, Jun Zhao <mypopydev@gmail.com> wrote: > From: Jun Zhao <barryjzhao@tencent.com> > > Fixed vpad.name leak in error path, move the vpad related operation > only if enabeled show IR frequency response. > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com> > --- > libavfilter/af_afir.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c > index 7c7e845..5ba880f 100644 > --- a/libavfilter/af_afir.c > +++ b/libavfilter/af_afir.c > @@ -876,6 +876,12 @@ static av_cold int init(AVFilterContext *ctx) > if (!pad.name) > return AVERROR(ENOMEM); > > + ret = ff_insert_outpad(ctx, 0, &pad); > + if (ret < 0) { > + av_freep(&pad.name); > + return ret; > + } > + > if (s->response) { > vpad = (AVFilterPad){ > .name = av_strdup("filter_response"), > @@ -884,15 +890,7 @@ static av_cold int init(AVFilterContext *ctx) > }; > if (!vpad.name) > return AVERROR(ENOMEM); > - } > > - ret = ff_insert_outpad(ctx, 0, &pad); > - if (ret < 0) { > - av_freep(&pad.name); > - return ret; > - } > - > - if (s->response) { > ret = ff_insert_outpad(ctx, 1, &vpad); > if (ret < 0) { > av_freep(&vpad.name); > -- > 2.7.4 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Mon, May 25, 2020 at 3:51 PM Paul B Mahol <onemda@gmail.com> wrote: > > typo in commit message. Will fix, tks > > On 5/25/20, Jun Zhao <mypopydev@gmail.com> wrote: > > From: Jun Zhao <barryjzhao@tencent.com> > > > > Fixed vpad.name leak in error path, move the vpad related operation > > only if enabeled show IR frequency response. > > > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com> > > --- > > libavfilter/af_afir.c | 14 ++++++-------- > > 1 file changed, 6 insertions(+), 8 deletions(-) > > > > diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c > > index 7c7e845..5ba880f 100644 > > --- a/libavfilter/af_afir.c > > +++ b/libavfilter/af_afir.c > > @@ -876,6 +876,12 @@ static av_cold int init(AVFilterContext *ctx) > > if (!pad.name) > > return AVERROR(ENOMEM); > > > > + ret = ff_insert_outpad(ctx, 0, &pad); > > + if (ret < 0) { > > + av_freep(&pad.name); > > + return ret; > > + } > > + > > if (s->response) { > > vpad = (AVFilterPad){ > > .name = av_strdup("filter_response"), > > @@ -884,15 +890,7 @@ static av_cold int init(AVFilterContext *ctx) > > }; > > if (!vpad.name) > > return AVERROR(ENOMEM); > > - } > > > > - ret = ff_insert_outpad(ctx, 0, &pad); > > - if (ret < 0) { > > - av_freep(&pad.name); > > - return ret; > > - } > > - > > - if (s->response) { > > ret = ff_insert_outpad(ctx, 1, &vpad); > > if (ret < 0) { > > av_freep(&vpad.name); > > -- > > 2.7.4 > >
diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 7c7e845..5ba880f 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -876,6 +876,12 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); + ret = ff_insert_outpad(ctx, 0, &pad); + if (ret < 0) { + av_freep(&pad.name); + return ret; + } + if (s->response) { vpad = (AVFilterPad){ .name = av_strdup("filter_response"), @@ -884,15 +890,7 @@ static av_cold int init(AVFilterContext *ctx) }; if (!vpad.name) return AVERROR(ENOMEM); - } - ret = ff_insert_outpad(ctx, 0, &pad); - if (ret < 0) { - av_freep(&pad.name); - return ret; - } - - if (s->response) { ret = ff_insert_outpad(ctx, 1, &vpad); if (ret < 0) { av_freep(&vpad.name);