Skip to content

Commit 3a7100e

Browse files
committed
Check return value when calling musig_key_agg
1 parent e02379d commit 3a7100e

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/handler/lib/policy.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,9 @@ __attribute__((warn_unused_result)) static int get_derived_pubkey(
489489
qsort(keys, musig_info->n, sizeof(plain_pk_t), compare_plain_pk);
490490

491491
musig_keyagg_context_t musig_ctx;
492-
musig_key_agg(keys, musig_info->n, &musig_ctx);
492+
if (0 > musig_key_agg(keys, musig_info->n, &musig_ctx)) {
493+
return -1;
494+
}
493495

494496
// compute the aggregated extended pubkey
495497
memset(&ext_pubkey, 0, sizeof(ext_pubkey));

src/handler/sign_psbt.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,9 @@ static bool fill_keyexpr_info_if_internal(dispatcher_context_t *dc,
659659
qsort(keys, musig_info->n, sizeof(plain_pk_t), compare_plain_pk);
660660

661661
musig_keyagg_context_t musig_ctx;
662-
musig_key_agg(keys, musig_info->n, &musig_ctx);
662+
if (0 > musig_key_agg(keys, musig_info->n, &musig_ctx)) {
663+
return false;
664+
}
663665

664666
// compute the aggregated extended pubkey
665667
memset(&keyexpr_info->pubkey, 0, sizeof(keyexpr_info->pubkey));

src/musig/musig.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,11 @@ static int musig_get_session_values(const musig_session_context_t *session_ctx,
385385

386386
// Perform key aggregation and tweaking
387387
musig_keyagg_context_t keyagg_ctx;
388-
musig_key_agg(session_ctx->pubkeys, session_ctx->n_keys, &keyagg_ctx);
388+
389+
if (0 > musig_key_agg(session_ctx->pubkeys, session_ctx->n_keys, &keyagg_ctx)) {
390+
return -1;
391+
}
392+
389393
for (size_t i = 0; i < session_ctx->n_tweaks; i++) {
390394
if (0 > apply_tweak(&keyagg_ctx, session_ctx->tweaks[i], session_ctx->is_xonly[i])) {
391395
return -1;

0 commit comments

Comments
 (0)