Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2024-11-27 12:46:22 +01:00
Code Issues Projects Releases Wiki Activity

Tolerate missing terminating newlines in Java release files

Browse Source 
Had a report out in the wild of a release file that doesn't end in a
terminating newline, which was causing the parser to blow up.
This commit relaxes the parsing to tolerate EOFs while parsing values.
This commit is contained in:
Henry Le Grys 2021-09-27 21:21:46 +01:00
parent 1c663e1c04
commit 9bd7df4d3c
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
launcher/src/main/java/com/skcraft/launcher/util/EnvironmentParser.java
View File

@ -85,23 +85,28 @@ public class EnvironmentParser {
private String parseValue() throws IOException {
StringBuilder buffer = new StringBuilder();
while (true) {
char c = read();
try {
while (true) {
char c = read();
switch (c) {
case '\r':
case '\n':
return buffer.toString();
case '"':
buffer.append(parseQuotedPhrase());
break;
case '\\':
char next = read();
buffer.append(next);
break;
default:
buffer.append(c);
switch (c) {
case '\r':
case '\n':
return buffer.toString();
case '"':
buffer.append(parseQuotedPhrase());
break;
case '\\':
char next = read();
buffer.append(next);
break;
default:
buffer.append(c);
}
}
} catch (EOFException e) {
// No terminating newline. bad!
return buffer.toString();
}
}