Skip to content

fix: handle zero-input transaction parsing #2298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xsatoshi99 wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −7
Open

fix: handle zero-input transaction parsing #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/cjs/transaction.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,19 @@ class Transaction {
marker === Transaction.ADVANCED_TRANSACTION_MARKER &&
flag === Transaction.ADVANCED_TRANSACTION_FLAG
) {
hasWitnesses = true;
const { bigintValue: vinLenPeek, bytes: vinLenBytes } =
bufferutils_js_1.varuint.decode(buffer, bufferReader.offset);
const minInputSize = 41;
const remainingAfterVinLen =
buffer.length - bufferReader.offset - vinLenBytes;
if (
vinLenPeek === BigInt(0) ||
Number(vinLenPeek) * minInputSize > remainingAfterVinLen
) {
bufferReader.offset -= 2;
} else {
hasWitnesses = true;
}
} else {
bufferReader.offset -= 2;
}
Expand Down
16 changes: 15 additions & 1 deletion src/esm/transaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,21 @@ export class Transaction {
marker === Transaction.ADVANCED_TRANSACTION_MARKER &&
flag === Transaction.ADVANCED_TRANSACTION_FLAG
) {
hasWitnesses = true;
const { bigintValue: vinLenPeek, bytes: vinLenBytes } = varuint.decode(
buffer,
bufferReader.offset,
);
const minInputSize = 41;
const remainingAfterVinLen =
buffer.length - bufferReader.offset - vinLenBytes;
if (
vinLenPeek === BigInt(0) ||
Number(vinLenPeek) * minInputSize > remainingAfterVinLen
) {
bufferReader.offset -= 2;
} else {
hasWitnesses = true;
}
} else {
bufferReader.offset -= 2;
}
Expand Down
20 changes: 15 additions & 5 deletions ts_src/transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,33 @@ export class Transaction {

static fromBuffer(buffer: Uint8Array, _NO_STRICT?: boolean): Transaction {
const bufferReader = new BufferReader(buffer);

const tx = new Transaction();
tx.version = bufferReader.readUInt32();

const marker = bufferReader.readUInt8();
const flag = bufferReader.readUInt8();

let hasWitnesses = false;
if (
marker === Transaction.ADVANCED_TRANSACTION_MARKER &&
flag === Transaction.ADVANCED_TRANSACTION_FLAG
) {
hasWitnesses = true;
const { bigintValue: vinLenPeek, bytes: vinLenBytes } = varuint.decode(
buffer,
bufferReader.offset,
);
const minInputSize = 41;
const remainingAfterVinLen =
buffer.length - bufferReader.offset - vinLenBytes;
if (
vinLenPeek === BigInt(0) ||
Number(vinLenPeek) * minInputSize > remainingAfterVinLen
) {
bufferReader.offset -= 2;
} else {
hasWitnesses = true;
}
} else {
bufferReader.offset -= 2;
}

const vinLen = bufferReader.readVarInt();
for (let i = 0; i < vinLen; ++i) {
tx.ins.push({
Expand Down