Add paranoid error check when listing cameras

hrydgard · Dec 20, 2023 · 8810d95 · 8810d95
1 parent 72e46ac
commit 8810d95
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
@@ -1482,8 +1482,12 @@ std::vector<std::string> System_GetCameraDeviceList() {
 
 	for (int i = 0; i < arrayListObjectLen; i++) {
 		jstring dev = static_cast<jstring>(getEnv()->CallObjectMethod(deviceListObject, arrayListGet, i));
-		const char* cdev = getEnv()->GetStringUTFChars(dev, nullptr);
-		deviceListVector.push_back(cdev);
+		const char *cdev = getEnv()->GetStringUTFChars(dev, nullptr);
+		if (!cdev) {
+			getEnv()->DeleteLocalRef(dev);
+			continue;
+		}
+		deviceListVector.push_back(std::string(cdev));
 		getEnv()->ReleaseStringUTFChars(dev, cdev);
 		getEnv()->DeleteLocalRef(dev);
 	}