From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 13 Mar 2015 08:40:48 +0000 (+0100)
Subject: mediacodec: check getOutputBuffers and getInputBuffers
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=af7de2b68dc9c47c747bb39491ea8d35e333a764;p=vlc

mediacodec: check getOutputBuffers and getInputBuffers

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c
index 7e8bf762ea..114b648243 100644
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -613,7 +613,15 @@ loopclean:
 
     if (p_sys->get_input_buffers && p_sys->get_output_buffers) {
         p_sys->input_buffers = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_input_buffers);
+        if (CHECK_EXCEPTION()) {
+            msg_Err(p_dec, "Exception in MediaCodec.getInputBuffers (OpenDecoder)");
+            goto error;
+        }
         p_sys->output_buffers = (*env)->CallObjectMethod(env, p_sys->codec, p_sys->get_output_buffers);
+        if (CHECK_EXCEPTION()) {
+            msg_Err(p_dec, "Exception in MediaCodec.getOutputBuffers (OpenDecoder)");
+            goto error;
+        }
         p_sys->input_buffers = (*env)->NewGlobalRef(env, p_sys->input_buffers);
         p_sys->output_buffers = (*env)->NewGlobalRef(env, p_sys->output_buffers);
     }