Skip to content

V
vlc
Commit addc5f26 authored by Felix Abecassis's avatar Felix Abecassis Committed by Jean-Baptiste Kempf
Browse files
Options

mediacodec: add more safety checks when trying to get codec capabilities 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 93f201fb
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
modules/codec/omxil/android_mediacodec.c
View file @ addc5f26
...@@ -310,8 +310,13 @@ static int OpenDecoder(vlc_object_t *p_this) ...@@ -310,8 +310,13 @@ static int OpenDecoder(vlc_object_t *p_this)
jobject codec_capabilities = (*env)->CallObjectMethod(env, info, p_sys->get_capabilities_for_type, jobject codec_capabilities = (*env)->CallObjectMethod(env, info, p_sys->get_capabilities_for_type,
(*env)->NewStringUTF(env, mime)); (*env)->NewStringUTF(env, mime));
jobject profile_levels = (*env)->GetObjectField(env, codec_capabilities, p_sys->profile_levels_field); jobject profile_levels = NULL;
int profile_levels_len = profile_levels ? (*env)->GetArrayLength(env, profile_levels) : 0; int profile_levels_len = 0;
if (codec_capabilities) {
profile_levels = (*env)->GetObjectField(env, codec_capabilities, p_sys->profile_levels_field);
if (profile_levels)
profile_levels_len = (*env)->GetArrayLength(env, profile_levels);
}
msg_Dbg(p_dec, "Number of profile levels: %d", profile_levels_len); msg_Dbg(p_dec, "Number of profile levels: %d", profile_levels_len);
jobject types = (*env)->CallObjectMethod(env, info, p_sys->get_supported_types); jobject types = (*env)->CallObjectMethod(env, info, p_sys->get_supported_types);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment