Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-07 06:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Make Script throw ScriptException instead of ArrayIndexOutOfBounds

Browse Source 
...when an invalid PUSHDATA constant is used.
This commit is contained in:
Matt Corallo 2012-07-14 03:17:27 +02:00 committed by Mike Hearn
parent c5e62f16b0
commit 8cd9cc11a4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/google/bitcoin/core/Script.java
View File

@ -114,6 +114,8 @@ public class Script {
private byte[] getData(int len) throws ScriptException {
if (len > program.length - cursor)
throw new ScriptException("Failed read of " + len + " bytes");
try {
byte[] buf = new byte[len];
System.arraycopy(program, cursor, buf, 0, len);
@ -123,11 +125,19 @@ public class Script {
// We want running out of data in the array to be treated as a handleable script parsing exception,
// not something that abnormally terminates the app.
throw new ScriptException("Failed read of " + len + " bytes", e);
} catch (NegativeArraySizeException e) {
// We want running out of data in the array to be treated as a handleable script parsing exception,
// not something that abnormally terminates the app.
throw new ScriptException("Failed read of " + len + " bytes", e);
}
}
private int readByte() {
return 0xFF & program[cursor++];
private int readByte() throws ScriptException {
try {
return 0xFF & program[cursor++];
} catch (ArrayIndexOutOfBoundsException e) {
throw new ScriptException("Attempted to read outside of script boundaries");
}
}
/**