Commit efad04c317d1f04ed31d94c119d8f630a895cd8d

Philipp Wiesemann 2015-09-18T21:26:46

Android: Added check if Java method for APK expansion file exists.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index 96cc486..d7bb94b 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -788,6 +788,10 @@ fallback:
             /* Try fallback to APK expansion files */
             mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, context),
                 "openAPKExpansionInputStream", "(Ljava/lang/String;)Ljava/io/InputStream;");
+            if (!mid) {
+                SDL_SetError("No openAPKExpansionInputStream() in Java class");
+                goto failure; /* Java class is missing the required method */
+            }
             inputStream = (*mEnv)->CallObjectMethod(mEnv, context, mid, fileNameJString);
 
             /* Exception is checked first because it always needs to be cleared.