sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-11-05 03:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

continue with transaction parsing if pushdata opcode is found with invalid data length

Browse source
This commit is contained in:
Craig Raw 2023-06-05 11:41:41 +02:00
parent d3e003f76e
commit a8df17ff5e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/sparrowwallet/drongo/protocol/Script.java
View file

@ -4,6 +4,8 @@ import com.sparrowwallet.drongo.Utils;
import com.sparrowwallet.drongo.address.*; import com.sparrowwallet.drongo.address.*;
import com.sparrowwallet.drongo.crypto.ECKey; import com.sparrowwallet.drongo.crypto.ECKey;
import org.bouncycastle.util.encoders.Hex; import org.bouncycastle.util.encoders.Hex;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -18,6 +20,8 @@ import static com.sparrowwallet.drongo.protocol.ScriptType.*;
import static com.sparrowwallet.drongo.protocol.ScriptOpCodes.*; import static com.sparrowwallet.drongo.protocol.ScriptOpCodes.*;
public class Script { public class Script {
private static final Logger log = LoggerFactory.getLogger(Script.class);
public static final long MAX_SCRIPT_ELEMENT_SIZE = 520; public static final long MAX_SCRIPT_ELEMENT_SIZE = 520;
// The program is a set of chunks where each element is either [opcode] or [data, data, data ...] // The program is a set of chunks where each element is either [opcode] or [data, data, data ...]
@ -32,7 +36,11 @@ public class Script {
Script(byte[] programBytes, boolean parse) { Script(byte[] programBytes, boolean parse) {
program = programBytes; program = programBytes;
if(parse) { if(parse) {
parse(); try {
parse();
} catch(ProtocolException e) {
log.warn("Invalid script, continuing with already parsed chunks", e);
}
} }
} }
@ -59,16 +67,16 @@ public class Script {
// Read some bytes of data, where how many is the opcode value itself. // Read some bytes of data, where how many is the opcode value itself.
dataToRead = opcode; dataToRead = opcode;
} else if (opcode == OP_PUSHDATA1) { } else if (opcode == OP_PUSHDATA1) {
if (bis.available() < 1) throw new ProtocolException("Unexpected end of script"); if (bis.available() < 1) throw new ProtocolException("Unexpected end of script - OP_PUSHDATA1 was followed by " + bis.available() + " bytes");
dataToRead = bis.read(); dataToRead = bis.read();
} else if (opcode == OP_PUSHDATA2) { } else if (opcode == OP_PUSHDATA2) {
// Read a short, then read that many bytes of data. // Read a short, then read that many bytes of data.
if (bis.available() < 2) throw new ProtocolException("Unexpected end of script"); if (bis.available() < 2) throw new ProtocolException("Unexpected end of script - OP_PUSHDATA2 was followed by only " + bis.available() + " bytes");
dataToRead = Utils.readUint16FromStream(bis); dataToRead = Utils.readUint16FromStream(bis);
} else if (opcode == OP_PUSHDATA4) { } else if (opcode == OP_PUSHDATA4) {
// Read a uint32, then read that many bytes of data. // Read a uint32, then read that many bytes of data.
// Though this is allowed, because its value cannot be > 520, it should never actually be used // Though this is allowed, because its value cannot be > 520, it should never actually be used
if (bis.available() < 4) throw new ProtocolException("Unexpected end of script"); if (bis.available() < 4) throw new ProtocolException("Unexpected end of script - OP_PUSHDATA4 was followed by only " + bis.available() + " bytes");
dataToRead = Utils.readUint32FromStream(bis); dataToRead = Utils.readUint32FromStream(bis);
} }