mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 06:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Do checking for a valid core name in ModuleWrapper. Prevents a potential crash when random files are tossed in the cores folder.

Browse Source
This commit is contained in:
Lioncash 2013-11-02 22:14:30 -04:00
parent 08305ec877
commit dd8a57f26c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/phoenix/src/com/retroarch/browser/ModuleWrapper.java
View File

@ -37,8 +37,11 @@ public final class ModuleWrapper implements IconAdapterItem, Comparable<ModuleWr
// Attempt to get the core's info file. // Attempt to get the core's info file.
// Basically this is dataDir/info/[core name].info // Basically this is dataDir/info/[core name].info
// So first, since the core name will contain platform specific strings at the end of name, we trim this. // So first, since the core name will have a platform-specific identifier at the end of its name, we trim this.
final String coreName = file.getName().substring(0, file.getName().lastIndexOf("_android.so")); // If it turns out we have an invalid core name, simply assign the core name as the full name of the file.
final boolean isValidCoreName = (file.getName().lastIndexOf("_android.so") != -1);
final String coreName = (isValidCoreName) ? file.getName().substring(0, file.getName().lastIndexOf("_android.so"))
: file.getName();
// Now get the directory where all of the info files are kept (dataDir/info) // Now get the directory where all of the info files are kept (dataDir/info)
final String infoFileDir = context.getApplicationInfo().dataDir + File.separator + "info"; final String infoFileDir = context.getApplicationInfo().dataDir + File.separator + "info";