Skip to content

psbt: return ENOMEM for any wally_malloc failures #204

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

Closed
niftynei wants to merge 1 commit into from
Closed

psbt: return ENOMEM for any wally_malloc failures #204

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
18 changes: 18 additions & 0 deletions src/psbt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,10 +721,16 @@ int wally_psbt_init_alloc(

if (inputs_allocation_len) {
new_inputs = wally_malloc(inputs_allocation_len * sizeof(struct wally_psbt_input));
if (!new_inputs) {
return WALLY_ENOMEM;
}
wally_bzero(new_inputs, inputs_allocation_len * sizeof(*new_inputs));
}
if (outputs_allocation_len) {
new_outputs = wally_malloc(outputs_allocation_len * sizeof(struct wally_psbt_output));
if (!new_outputs) {
return WALLY_ENOMEM;
}
wally_bzero(new_outputs, outputs_allocation_len * sizeof(*new_outputs));
}
wally_unknowns_map_init_alloc(global_unknowns_allocation_len, &result->unknowns);
Expand Down Expand Up @@ -1218,6 +1224,9 @@ static int psbt_input_from_bytes(

/* Read the path itself */
keypaths->items[keypaths->num_items].origin.path = wally_malloc(path_len * sizeof(uint32_t));
if (!keypaths->items[keypaths->num_items].origin.path) {
return WALLY_ENOMEM;
}
for (i = 0; i < path_len; ++i) {
p += uint32_from_le_bytes(p, &keypaths->items[keypaths->num_items].origin.path[i]);
}
Expand Down Expand Up @@ -1389,6 +1398,9 @@ static int psbt_output_from_bytes(

/* Read the path itself */
keypaths->items[keypaths->num_items].origin.path = wally_malloc(path_len * sizeof(uint32_t));
if (!keypaths->items[keypaths->num_items].origin.path) {
return WALLY_ENOMEM;
}
for (i = 0; i < path_len; ++i) {
p += uint32_from_le_bytes(p, &keypaths->items[keypaths->num_items].origin.path[i]);
}
Expand Down Expand Up @@ -2787,6 +2799,9 @@ int wally_finalize_psbt(struct wally_psbt *psbt)
/* P2SH wrapped witness requires final scriptsig of pushing the redeemScript */
script_sig_len = varint_get_length(input->redeem_script_len) + input->redeem_script_len;
input->final_script_sig = wally_malloc(script_sig_len);
if (!input->final_script_sig) {
return WALLY_ENOMEM;
}
if ((ret = wally_script_push_from_bytes(input->redeem_script, input->redeem_script_len, 0, input->final_script_sig, script_sig_len, &written)) != WALLY_OK) {
wally_free(input->final_script_sig);
return ret;
Expand Down Expand Up @@ -2897,6 +2912,9 @@ int wally_finalize_psbt(struct wally_psbt *psbt)
/* P2SH wrapped witness requires final scriptsig of pushing the redeemScript */
script_sig_len = varint_get_length(input->redeem_script_len) + input->redeem_script_len;
input->final_script_sig = wally_malloc(script_sig_len);
if (!input->final_script_sig) {
return WALLY_ENOMEM;
}
if ((ret = wally_script_push_from_bytes(input->redeem_script, input->redeem_script_len, 0, input->final_script_sig, script_sig_len, &written)) != WALLY_OK) {
wally_free(input->final_script_sig);
return ret;
Expand Down