diff options
| author | Christian Grothoff <christian@grothoff.org> | 2019-09-16 22:11:04 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2019-09-16 22:11:04 +0200 |
| commit | 2a84699d90ed4780c8a816eccaac3229e9543e40 (patch) | |
| tree | fa50f83d60807f729c565accffca2e02c6454dcd /src/lib/merchant_api_track_transfer.c | |
| parent | 27720961219c16cd11890634ce7934850219511e (diff) | |
| download | merchant-2a84699d90ed4780c8a816eccaac3229e9543e40.tar.gz merchant-2a84699d90ed4780c8a816eccaac3229e9543e40.tar.bz2 merchant-2a84699d90ed4780c8a816eccaac3229e9543e40.zip | |
fixing misc memory leaks related to json, including #5769, as well as an unrelated use-after-free
Diffstat (limited to 'src/lib/merchant_api_track_transfer.c')
| -rw-r--r-- | src/lib/merchant_api_track_transfer.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/lib/merchant_api_track_transfer.c b/src/lib/merchant_api_track_transfer.c index 8c8121a4..b5105c54 100644 --- a/src/lib/merchant_api_track_transfer.c +++ b/src/lib/merchant_api_track_transfer.c @@ -82,7 +82,8 @@ struct TALER_MERCHANT_TrackTransferHandle * #GNUNET_SYSERR if the response was bogus */ static int -check_track_transfer_response_ok (struct TALER_MERCHANT_TrackTransferHandle *wdh, +check_track_transfer_response_ok (struct + TALER_MERCHANT_TrackTransferHandle *wdh, const json_t *json) { json_t *deposits; @@ -97,7 +98,7 @@ check_track_transfer_response_ok (struct TALER_MERCHANT_TrackTransferHandle *wdh GNUNET_JSON_spec_fixed_auto ("H_wire", &h_wire), GNUNET_JSON_spec_json ("deposits_sums", &deposits), GNUNET_JSON_spec_fixed_auto ("exchange_pub", &exchange_pub), - GNUNET_JSON_spec_end() + GNUNET_JSON_spec_end () }; if (GNUNET_OK != @@ -112,7 +113,7 @@ check_track_transfer_response_ok (struct TALER_MERCHANT_TrackTransferHandle *wdh { struct TALER_MERCHANT_TrackTransferDetails details[num_details]; - for (unsigned int i=0;i<num_details;i++) + for (unsigned int i = 0; i<num_details; i++) { struct TALER_MERCHANT_TrackTransferDetails *detail = &details[i]; json_t *deposit = json_array_get (deposits, i); @@ -120,7 +121,7 @@ check_track_transfer_response_ok (struct TALER_MERCHANT_TrackTransferHandle *wdh GNUNET_JSON_spec_string ("order_id", &detail->order_id), TALER_JSON_spec_amount ("deposit_value", &detail->deposit_value), TALER_JSON_spec_amount ("deposit_fee", &detail->deposit_fee), - GNUNET_JSON_spec_end() + GNUNET_JSON_spec_end () }; if (GNUNET_OK != @@ -135,7 +136,7 @@ check_track_transfer_response_ok (struct TALER_MERCHANT_TrackTransferHandle *wdh } wdh->cb (wdh->cb_cls, MHD_HTTP_OK, - TALER_EC_NONE, + TALER_EC_NONE, &exchange_pub, json, &h_wire, @@ -181,7 +182,7 @@ handle_track_transfer_finished (void *cls, response_code = 0; break; case MHD_HTTP_FAILED_DEPENDENCY: - /* Not a reason to break execution. */ + /* Not a reason to break execution. */ break; case MHD_HTTP_NOT_FOUND: /* Nothing really to verify, this should never @@ -202,7 +203,7 @@ handle_track_transfer_finished (void *cls, } tdo->cb (tdo->cb_cls, response_code, - TALER_JSON_get_error_code (json), + TALER_JSON_get_error_code (json), NULL, json, NULL, @@ -230,10 +231,12 @@ struct TALER_MERCHANT_TrackTransferHandle * TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context *ctx, const char *backend_url, const char *instance, - const char *wire_method, - const struct TALER_WireTransferIdentifierRawP *wtid, + const char *wire_method, + const struct + TALER_WireTransferIdentifierRawP *wtid, const char *exchange_url, - TALER_MERCHANT_TrackTransferCallback track_transfer_cb, + TALER_MERCHANT_TrackTransferCallback + track_transfer_cb, void *track_transfer_cb_cls) { struct TALER_MERCHANT_TrackTransferHandle *tdo; @@ -241,7 +244,8 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context *ctx, char *wtid_str; wtid_str = GNUNET_STRINGS_data_to_string_alloc (wtid, - sizeof (struct TALER_WireTransferIdentifierRawP)); + sizeof (struct + TALER_WireTransferIdentifierRawP)); tdo = GNUNET_new (struct TALER_MERCHANT_TrackTransferHandle); tdo->ctx = ctx; tdo->cb = track_transfer_cb; // very last to be called @@ -274,7 +278,8 @@ TALER_MERCHANT_track_transfer (struct GNUNET_CURL_Context *ctx, * @param tdo handle to the tracking operation being cancelled */ void -TALER_MERCHANT_track_transfer_cancel (struct TALER_MERCHANT_TrackTransferHandle *tdo) +TALER_MERCHANT_track_transfer_cancel (struct + TALER_MERCHANT_TrackTransferHandle *tdo) { if (NULL != tdo->job) { |