[FFmpeg-devel] lavc/libopusdec: Allow avcodec_open2 to call .close

Submitted by Matthew Wolenetz on April 10, 2018, 9:13 p.m.

Details

Message ID CAADho6N3Qp7KbGadxCVWEXs7_ripbDbZaeCRjzi8_maJew3fgg@mail.gmail.com
State New
Headers show

Commit Message

Matthew Wolenetz April 10, 2018, 9:13 p.m.

Comments

Michael Niedermayer April 10, 2018, 10:43 p.m.
On Tue, Apr 10, 2018 at 02:13:28PM -0700, Matthew Wolenetz wrote:
> 

>  libopusdec.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> a62bece9f45c68d93e138cb021a533fbc242ddc3  0001-lavc-libopusdec-Allow-avcodec_open2-to-call-.close.patch
> From 031e96bd481b7b8d0c11e5353f74fafc69e37f09 Mon Sep 17 00:00:00 2001
> From: Matt Wolenetz <wolenetz@google.com>
> Date: Tue, 10 Apr 2018 13:59:25 -0700
> Subject: [PATCH] lavc/libopusdec: Allow avcodec_open2 to call .close
> 
> If there is a decoder initialization failure detected in avcodec_open2
> after .init is called, allow graceful decoder .close to prevent leaking
> libopus decoder allocations.
> 
> BUG=828526
> ---
>  libavcodec/libopusdec.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

Doesnt apply, also the NULL check already exists in git master
FF_CODEC_CAP_INIT_CLEANUP is missing in master though

can you update the patch ?

thx
Michael Niedermayer April 11, 2018, 12:29 a.m.
On Wed, Apr 11, 2018 at 12:43:21AM +0200, Michael Niedermayer wrote:
> On Tue, Apr 10, 2018 at 02:13:28PM -0700, Matthew Wolenetz wrote:
> > 
> 
> >  libopusdec.c |    6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> > a62bece9f45c68d93e138cb021a533fbc242ddc3  0001-lavc-libopusdec-Allow-avcodec_open2-to-call-.close.patch
> > From 031e96bd481b7b8d0c11e5353f74fafc69e37f09 Mon Sep 17 00:00:00 2001
> > From: Matt Wolenetz <wolenetz@google.com>
> > Date: Tue, 10 Apr 2018 13:59:25 -0700
> > Subject: [PATCH] lavc/libopusdec: Allow avcodec_open2 to call .close
> > 
> > If there is a decoder initialization failure detected in avcodec_open2
> > after .init is called, allow graceful decoder .close to prevent leaking
> > libopus decoder allocations.
> > 
> > BUG=828526
> > ---
> >  libavcodec/libopusdec.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> Doesnt apply, also the NULL check already exists in git master
> FF_CODEC_CAP_INIT_CLEANUP is missing in master though
> 
> can you update the patch ?

forget this, will apply your patch

i had this applied locally and didnt realize, i even checked
what patches i had on the changed file, somehow i must have
done something silly

commit 4614d94f049319353f6c9deba1079009dd85594c 
Author: Andrew Allen <bitllama@google.com>
Date:   Wed Mar 28 14:48:46 2018 -0700

    Support for Ambisonics and OpusProjection* API.
    
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>


[...]

Patch hide | download patch | download mbox

From 031e96bd481b7b8d0c11e5353f74fafc69e37f09 Mon Sep 17 00:00:00 2001
From: Matt Wolenetz <wolenetz@google.com>
Date: Tue, 10 Apr 2018 13:59:25 -0700
Subject: [PATCH] lavc/libopusdec: Allow avcodec_open2 to call .close

If there is a decoder initialization failure detected in avcodec_open2
after .init is called, allow graceful decoder .close to prevent leaking
libopus decoder allocations.

BUG=828526
---
 libavcodec/libopusdec.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c
index 3d2ee5b61b..2a97811d18 100644
--- a/libavcodec/libopusdec.c
+++ b/libavcodec/libopusdec.c
@@ -160,7 +160,10 @@  static av_cold int libopus_decode_close(AVCodecContext *avc)
 {
     struct libopus_context *opus = avc->priv_data;
 
-    opus_multistream_decoder_destroy(opus->dec);
+    if (opus->dec) {
+        opus_multistream_decoder_destroy(opus->dec);
+        opus->dec = NULL;
+    }
     return 0;
 }
 
@@ -252,6 +255,7 @@  AVCodec ff_libopus_decoder = {
     .decode         = libopus_decode,
     .flush          = libopus_flush,
     .capabilities   = AV_CODEC_CAP_DR1,
+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
                                                      AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
-- 
2.17.0.484.g0c8726318c-goog