From b9a30d29cb91ec66c3bb8d956640d20e641b6a4d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 7 Jun 2022 15:02:08 +0200 Subject: -fix minor bugs --- src/lib/exchange_api_auditor_add_denomination.c | 13 +++++++------ src/lib/exchange_api_batch_withdraw2.c | 5 +++-- src/lib/exchange_api_management_auditor_disable.c | 13 +++++++------ src/lib/exchange_api_management_auditor_enable.c | 13 +++++++------ src/lib/exchange_api_management_post_extensions.c | 19 +++++++++---------- src/lib/exchange_api_management_post_keys.c | 13 +++++++------ .../exchange_api_management_revoke_denomination_key.c | 12 +++++++----- src/lib/exchange_api_management_revoke_signing_key.c | 13 +++++++------ src/lib/exchange_api_management_set_global_fee.c | 13 +++++++------ src/lib/exchange_api_management_set_wire_fee.c | 13 +++++++------ src/lib/exchange_api_management_wire_disable.c | 13 +++++++------ src/lib/exchange_api_management_wire_enable.c | 13 +++++++------ src/lib/exchange_api_purse_create_with_merge.c | 6 +++--- 13 files changed, 85 insertions(+), 74 deletions(-) (limited to 'src/lib') diff --git a/src/lib/exchange_api_auditor_add_denomination.c b/src/lib/exchange_api_auditor_add_denomination.c index d01252a83..71f421d4d 100644 --- a/src/lib/exchange_api_auditor_add_denomination.c +++ b/src/lib/exchange_api_auditor_add_denomination.c @@ -192,16 +192,17 @@ TALER_EXCHANGE_add_auditor_denomination ( GNUNET_JSON_pack_data_auto ("auditor_sig", auditor_sig)); eh = TALER_AUDITOR_curl_easy_get_ (ah->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&ah->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&ah->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (ah->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_batch_withdraw2.c b/src/lib/exchange_api_batch_withdraw2.c index 52da9b401..e9da21992 100644 --- a/src/lib/exchange_api_batch_withdraw2.c +++ b/src/lib/exchange_api_batch_withdraw2.c @@ -414,8 +414,9 @@ TALER_EXCHANGE_batch_withdraw2 ( wh->cb = res_cb; wh->cb_cls = res_cb_cls; wh->num_coins = pds_length; - TALER_amount_set_zero (keys->currency, - &wh->requested_amount); + GNUNET_assert (GNUNET_OK == + TALER_amount_set_zero (keys->currency, + &wh->requested_amount)); GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv, &wh->reserve_pub.eddsa_pub); { diff --git a/src/lib/exchange_api_management_auditor_disable.c b/src/lib/exchange_api_management_auditor_disable.c index bfe60ee79..b1de80f0e 100644 --- a/src/lib/exchange_api_management_auditor_disable.c +++ b/src/lib/exchange_api_management_auditor_disable.c @@ -173,16 +173,17 @@ TALER_EXCHANGE_management_disable_auditor ( GNUNET_JSON_pack_timestamp ("validity_end", validity_end)); eh = TALER_EXCHANGE_curl_easy_get_ (ah->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&ah->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&ah->post_ctx, + eh, + body))) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (ah->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_management_auditor_enable.c b/src/lib/exchange_api_management_auditor_enable.c index a99449307..af75215ec 100644 --- a/src/lib/exchange_api_management_auditor_enable.c +++ b/src/lib/exchange_api_management_auditor_enable.c @@ -163,16 +163,17 @@ TALER_EXCHANGE_management_enable_auditor ( GNUNET_JSON_pack_timestamp ("validity_start", validity_start)); eh = TALER_EXCHANGE_curl_easy_get_ (ah->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&ah->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&ah->post_ctx, + eh, + body)) ) { GNUNET_break (0); json_decref (body); + if (NULL != eh) + curl_easy_cleanup (eh); GNUNET_free (ah->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_management_post_extensions.c b/src/lib/exchange_api_management_post_extensions.c index 87b0e0be8..544f85efc 100644 --- a/src/lib/exchange_api_management_post_extensions.c +++ b/src/lib/exchange_api_management_post_extensions.c @@ -23,6 +23,7 @@ #include "taler_json_lib.h" #include #include "taler_extensions.h" +#include "exchange_api_curl_defaults.h" #include "taler_exchange_service.h" #include "taler_signatures.h" #include "taler_curl_lib.h" @@ -154,26 +155,24 @@ TALER_EXCHANGE_management_post_extensions ( GNUNET_JSON_pack_data_auto ("extensions_sig", &ped->extensions_sig)); - eh = curl_easy_init (); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&ph->post_ctx, - eh, - body)) + eh = TALER_EXCHANGE_curl_easy_get_ (ph->url); + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&ph->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (ph->url); - GNUNET_free (eh); return NULL; } json_decref (body); GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Requesting URL '%s'\n", ph->url); - GNUNET_assert (CURLE_OK == curl_easy_setopt (eh, - CURLOPT_URL, - ph->url)); ph->job = GNUNET_CURL_job_add2 (ctx, eh, ph->post_ctx.headers, diff --git a/src/lib/exchange_api_management_post_keys.c b/src/lib/exchange_api_management_post_keys.c index d7790599a..291c0ac02 100644 --- a/src/lib/exchange_api_management_post_keys.c +++ b/src/lib/exchange_api_management_post_keys.c @@ -191,16 +191,17 @@ TALER_EXCHANGE_post_management_keys ( GNUNET_JSON_pack_array_steal ("signkey_sigs", signkey_sigs)); eh = TALER_EXCHANGE_curl_easy_get_ (ph->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&ph->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&ph->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (ph->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_management_revoke_denomination_key.c b/src/lib/exchange_api_management_revoke_denomination_key.c index f7ddeaed2..8d65b6451 100644 --- a/src/lib/exchange_api_management_revoke_denomination_key.c +++ b/src/lib/exchange_api_management_revoke_denomination_key.c @@ -175,15 +175,17 @@ TALER_EXCHANGE_management_revoke_denomination_key ( return NULL; } eh = TALER_EXCHANGE_curl_easy_get_ (rh->url); - if (GNUNET_OK != - TALER_curl_easy_post (&rh->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&rh->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (rh->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_management_revoke_signing_key.c b/src/lib/exchange_api_management_revoke_signing_key.c index 046d18729..aac27678f 100644 --- a/src/lib/exchange_api_management_revoke_signing_key.c +++ b/src/lib/exchange_api_management_revoke_signing_key.c @@ -165,16 +165,17 @@ TALER_EXCHANGE_management_revoke_signing_key ( GNUNET_JSON_pack_data_auto ("master_sig", master_sig)); eh = TALER_EXCHANGE_curl_easy_get_ (rh->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&rh->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&rh->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (rh->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_management_set_global_fee.c b/src/lib/exchange_api_management_set_global_fee.c index a79dddc9d..b600c8cbe 100644 --- a/src/lib/exchange_api_management_set_global_fee.c +++ b/src/lib/exchange_api_management_set_global_fee.c @@ -179,16 +179,17 @@ TALER_EXCHANGE_management_set_global_fees ( GNUNET_JSON_pack_uint64 ("purse_account_limit", purse_account_limit)); eh = TALER_EXCHANGE_curl_easy_get_ (sgfh->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&sgfh->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&sgfh->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (sgfh->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_management_set_wire_fee.c b/src/lib/exchange_api_management_set_wire_fee.c index 84c6fe909..5951b6e20 100644 --- a/src/lib/exchange_api_management_set_wire_fee.c +++ b/src/lib/exchange_api_management_set_wire_fee.c @@ -168,16 +168,17 @@ TALER_EXCHANGE_management_set_wire_fees ( TALER_JSON_pack_amount ("wire_fee", &fees->wire)); eh = TALER_EXCHANGE_curl_easy_get_ (swfh->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&swfh->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&swfh->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (swfh->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_management_wire_disable.c b/src/lib/exchange_api_management_wire_disable.c index 3bae8e3ab..5d97eef75 100644 --- a/src/lib/exchange_api_management_wire_disable.c +++ b/src/lib/exchange_api_management_wire_disable.c @@ -163,16 +163,17 @@ TALER_EXCHANGE_management_disable_wire ( GNUNET_JSON_pack_timestamp ("validity_end", validity_end)); eh = TALER_EXCHANGE_curl_easy_get_ (wh->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&wh->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&wh->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (wh->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_management_wire_enable.c b/src/lib/exchange_api_management_wire_enable.c index 6e3dbad19..55480474e 100644 --- a/src/lib/exchange_api_management_wire_enable.c +++ b/src/lib/exchange_api_management_wire_enable.c @@ -174,16 +174,17 @@ TALER_EXCHANGE_management_enable_wire ( GNUNET_JSON_pack_timestamp ("validity_start", validity_start)); eh = TALER_EXCHANGE_curl_easy_get_ (wh->url); - GNUNET_assert (NULL != eh); - if (GNUNET_OK != - TALER_curl_easy_post (&wh->post_ctx, - eh, - body)) + if ( (NULL == eh) || + (GNUNET_OK != + TALER_curl_easy_post (&wh->post_ctx, + eh, + body)) ) { GNUNET_break (0); + if (NULL != eh) + curl_easy_cleanup (eh); json_decref (body); GNUNET_free (wh->url); - GNUNET_free (eh); return NULL; } json_decref (body); diff --git a/src/lib/exchange_api_purse_create_with_merge.c b/src/lib/exchange_api_purse_create_with_merge.c index 4ca633360..2b4f1cd27 100644 --- a/src/lib/exchange_api_purse_create_with_merge.c +++ b/src/lib/exchange_api_purse_create_with_merge.c @@ -357,7 +357,6 @@ TALER_EXCHANGE_purse_create_with_merge ( GNUNET_free (pcm); return NULL; } - pcm->h_contract_terms = pcm->h_contract_terms; pcm->merge_timestamp = merge_timestamp; GNUNET_CRYPTO_eddsa_key_get_public (&purse_priv->eddsa_priv, &pcm->purse_pub.eddsa_pub); @@ -401,8 +400,9 @@ TALER_EXCHANGE_purse_create_with_merge ( } else { - TALER_amount_set_zero (pcm->purse_value_after_fees.currency, - &purse_fee); + GNUNET_assert (GNUNET_OK == + TALER_amount_set_zero (pcm->purse_value_after_fees.currency, + &purse_fee)); flags = TALER_WAMF_MODE_CREATE_FROM_PURSE_QUOTA; } -- cgit v1.2.3