[Android] [PATCH] mediacodec: add a NULL pointer check after getting the profileLevels field

[Felix Abecassis]

Oops, wrong ML.


2014-02-14 19:06 GMT+01:00 Felix Abecassis <felix.abecassis at gmail.com>:

> ---
>  modules/codec/omxil/android_mediacodec.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/modules/codec/omxil/android_mediacodec.c
> b/modules/codec/omxil/android_mediacodec.c
> index 9150acc..e0b5567 100644
> --- a/modules/codec/omxil/android_mediacodec.c
> +++ b/modules/codec/omxil/android_mediacodec.c
> @@ -308,7 +308,8 @@ static int OpenDecoder(vlc_object_t *p_this)
>         jobject codec_capabilities = (*env)->CallObjectMethod(env, info,
> p_sys->get_capabilities_for_type,
>
> (*env)->NewStringUTF(env, mime));
>         jobject profile_levels = (*env)->GetObjectField(env,
> codec_capabilities, p_sys->profile_levels_field);
> -       int profile_levels_len = (*env)->GetArrayLength(env,
> profile_levels);
> +       int profile_levels_len = profile_levels ?
> (*env)->GetArrayLength(env, profile_levels) : 0;
> +        msg_Dbg(p_dec, "Number of profile levels: %d",
> profile_levels_len);
>
>          jobject types = (*env)->CallObjectMethod(env, info,
> p_sys->get_supported_types);
>          int num_types = (*env)->GetArrayLength(env, types);
> @@ -319,7 +320,7 @@ static int OpenDecoder(vlc_object_t *p_this)
>                  /* The mime type is matching for this component. We
>                     now check if the capabilities of the codec is
>                     matching the video format. */
> -                if (p_dec->fmt_in.i_codec == VLC_CODEC_H264 &&
> fmt_profile) {
> +                if (p_dec->fmt_in.i_codec == VLC_CODEC_H264 &&
> fmt_profile && profile_levels_len) {
>                      for (int i = 0; i < profile_levels_len && !found;
> ++i) {
>                          jobject profile_level =
> (*env)->GetObjectArrayElement(env, profile_levels, i);
>
> --
> 1.8.3.2
>
>


-- 
Félix Abecassis
http://felix.abecassis.me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/android/attachments/20140214/84809d56/attachment.html>