simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-19 10:36:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #171 from Francessco121/bug/unicode-string-crash

Browse Source 
Fix assembler crash when invalid Unicode string escape sequences are used
This commit is contained in:
Simon Fortier 2018-08-30 17:24:32 -04:00 committed by GitHub
commit a1cf279b6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -18,3 +18,5 @@ Server/src/main/java/META-INF/MANIFEST.MF
.settings .settings
.project .project
.classpath .classpath
# VSCode Workspace
.vscode/

7
Server/src/main/java/net/simon987/server/assembly/Assembler.java
View File

@ -156,7 +156,14 @@ public class Assembler {
//Unescape the string //Unescape the string
String string = value.substring(1, value.length() - 1); String string = value.substring(1, value.length() - 1);
try {
string = StringEscapeUtils.unescapeJava(string); string = StringEscapeUtils.unescapeJava(string);
} catch (IllegalArgumentException e) {
throw new InvalidOperandException(
"Invalid string operand \"" + string + "\": " + e.getMessage(),
currentLine);
}
out.write(string.getBytes(StandardCharsets.UTF_16BE)); out.write(string.getBytes(StandardCharsets.UTF_16BE));
} else if (labels != null && labels.containsKey(value)) { } else if (labels != null && labels.containsKey(value)) {