Fixed bug 3932 - Android, GetDisplayDPI release local reference

Sylvain When writing JNI code, one has to make sure all local references are released otherwise the app end up crashing.
libsdl-org · Nov 2, 2017 · 9192c93 · 9192c93
1 parent a7d2d12
commit 9192c93
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
@@ -1065,9 +1065,19 @@ int Android_JNI_GetDisplayDPI(float *ddpi, float *xdpi, float *ydpi)
     float nativeYdpi = (*env)->GetFloatField(env, jDisplayObj, fidYdpi);
     int nativeDdpi = (*env)->GetIntField(env, jDisplayObj, fidDdpi);
 
-    *ddpi = (float)nativeDdpi;
-    *xdpi = nativeXdpi;
-    *ydpi = nativeYdpi;
+
+    (*env)->DeleteLocalRef(env, jDisplayObj);
+    (*env)->DeleteLocalRef(env, jDisplayClass);
+
+    if (ddpi) {
+        *ddpi = (float)nativeDdpi;
+    }
+    if (xdpi) {
+        *xdpi = nativeXdpi;
+    }
+    if (ydpi) {
+        *ydpi = nativeYdpi;
+    }
 
     return 0;
 }