Re: [FFmpeg-devel] [PATCH 2/2] lavc/mediacodec_wrapper: fix potential jni global reference leak

2017-12-15 Thread Matthieu Bouron
On Thu, Dec 14, 2017 at 11:09:14AM +0100, Matthieu Bouron wrote:
> ---
>  libavcodec/mediacodec_wrapper.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c
> index 4660e895ca..f54e06b0ef 100644
> --- a/libavcodec/mediacodec_wrapper.c
> +++ b/libavcodec/mediacodec_wrapper.c
> @@ -1194,6 +1194,9 @@ fail:
>  }
>\
>   
>\
>  if (ret < 0) {   
>\
> +if (codec->object) { 
>\
> +(*env)->DeleteGlobalRef(env, codec->object); 
>\
> +}
>\
>  ff_jni_reset_jfields(env, >jfields, jni_amediacodec_mapping, 
> 1, codec);  \
>  av_freep();
>\
>  }
>\
> -- 
> 2.15.1
> 

Rebased patch applied.

-- 
Matthieu B.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH 2/2] lavc/mediacodec_wrapper: fix potential jni global reference leak

2017-12-14 Thread Matthieu Bouron
---
 libavcodec/mediacodec_wrapper.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c
index 4660e895ca..f54e06b0ef 100644
--- a/libavcodec/mediacodec_wrapper.c
+++ b/libavcodec/mediacodec_wrapper.c
@@ -1194,6 +1194,9 @@ fail:
 }  
 \

 \
 if (ret < 0) { 
 \
+if (codec->object) {   
 \
+(*env)->DeleteGlobalRef(env, codec->object);   
 \
+}  
 \
 ff_jni_reset_jfields(env, >jfields, jni_amediacodec_mapping, 1, 
codec);  \
 av_freep();  
 \
 }  
 \
-- 
2.15.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel