Skip to content

psbt: fix broken script finder in wally_finalize_psbt #200

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

Merged
greenaddress merged 1 commit into from
Jun 2, 2020
Merged

psbt: fix broken script finder in wally_finalize_psbt #200

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: 10 additions & 4 deletions src/psbt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2697,7 +2697,7 @@ int wally_finalize_psbt(struct wally_psbt *psbt)
for (i = 0; i < psbt->num_inputs; ++i) {
struct wally_psbt_input *input = &psbt->inputs[i];
struct wally_tx_input *txin = &psbt->tx->inputs[i];
unsigned char *out_script; /* Script that determines how we should finalize this input, typically output script */
unsigned char *out_script = NULL; /* Script that determines how we should finalize this input, typically output script */
size_t out_script_len, type;
bool witness = false, p2sh = false;;

Expand All @@ -2710,16 +2710,22 @@ int wally_finalize_psbt(struct wally_psbt *psbt)
out_script = input->redeem_script;
out_script_len = input->redeem_script_len;
p2sh = true;
} else {
out_script = psbt->tx->outputs[txin->index].script;
out_script_len = psbt->tx->outputs[txin->index].script_len;
} else if (input->non_witness_utxo && input->non_witness_utxo->num_outputs > txin->index) {
struct wally_tx_output out = input->non_witness_utxo->outputs[txin->index];
out_script = out.script;
out_script_len = out.script_len;
}
if (input->witness_script) {
out_script = input->witness_script;
out_script_len = input->witness_script_len;
witness = true;
}

/* We need an outscript to do anything */
if (!out_script) {
continue;
}

if ((ret = wally_scriptpubkey_get_type(out_script, out_script_len, &type)) != WALLY_OK) {
return ret;
}
Expand Down