mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-26 00:40:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5967 from JonnyH/WIP/more-robust-android-settings-parser

Browse Source 
Make the Android settings parser a bit more robust
This commit is contained in:
JosJuice 2017-08-26 13:14:38 +02:00 committed by GitHub
commit 072b423de3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
View File

@ -274,10 +274,13 @@ public final class SettingsFile
current = sectionFromLine(line); current = sectionFromLine(line);
sections.put(current.getName(), current); sections.put(current.getName(), current);
} }
else if ((current != null) && line.contains("=")) else if ((current != null))
{ {
Setting setting = settingFromLine(current, line, fileName); Setting setting = settingFromLine(current, line, fileName);
current.putSetting(setting); if (setting != null)
{
current.putSetting(setting);
}
} }
} }
} }
@ -381,6 +384,12 @@ public final class SettingsFile
{ {
String[] splitLine = line.split("="); String[] splitLine = line.split("=");
if (splitLine.length != 2)
{
Log.warning("Skipping invalid config line \"" + line + "\"");
return null;
}
String key = splitLine[0].trim(); String key = splitLine[0].trim();
String value = splitLine[1].trim(); String value = splitLine[1].trim();