taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix logic to ensure that we do not call the callback after the iteration was aborted (caused big trouble in wirewatcher)

Browse Source
This commit is contained in:
Christian Grothoff 2020-03-20 12:34:26 +01:00
parent 10c56bcea0
commit 2021f75995
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/bank-lib/bank_api_credit.c
View File

@ -113,12 +113,18 @@ parse_account_history (struct TALER_BANK_CreditHistoryHandle *hh,
GNUNET_break_op (0); GNUNET_break_op (0);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
hh->hcb (hh->hcb_cls, if (GNUNET_OK !=
MHD_HTTP_OK, hh->hcb (hh->hcb_cls,
TALER_EC_NONE, MHD_HTTP_OK,
row_id, TALER_EC_NONE,
&td, row_id,
transaction); &td,
transaction))
{
hh->hcb = NULL;
GNUNET_JSON_parse_free (hist_spec);
return GNUNET_OK;
}
GNUNET_JSON_parse_free (hist_spec); GNUNET_JSON_parse_free (hist_spec);
} }
return GNUNET_OK; return GNUNET_OK;
@ -195,12 +201,13 @@ handle_credit_history_finished (void *cls,
response_code = 0; response_code = 0;
break; break;
} }
hh->hcb (hh->hcb_cls, if (NULL != hh->hcb)
response_code, hh->hcb (hh->hcb_cls,
ec, response_code,
0LLU, ec,
NULL, 0LLU,
j); NULL,
j);
TALER_BANK_credit_history_cancel (hh); TALER_BANK_credit_history_cancel (hh);
} }

31
src/bank-lib/bank_api_debit.c
View File

@ -115,12 +115,18 @@ parse_account_history (struct TALER_BANK_DebitHistoryHandle *hh,
GNUNET_break_op (0); GNUNET_break_op (0);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
hh->hcb (hh->hcb_cls, if (GNUNET_OK !=
MHD_HTTP_OK, hh->hcb (hh->hcb_cls,
TALER_EC_NONE, MHD_HTTP_OK,
row_id, TALER_EC_NONE,
&td, row_id,
transaction); &td,
transaction))
{
hh->hcb = NULL;
GNUNET_JSON_parse_free (hist_spec);
return GNUNET_OK;
}
GNUNET_JSON_parse_free (hist_spec); GNUNET_JSON_parse_free (hist_spec);
} }
return GNUNET_OK; return GNUNET_OK;
@ -199,12 +205,13 @@ handle_debit_history_finished (void *cls,
response_code = 0; response_code = 0;
break; break;
} }
hh->hcb (hh->hcb_cls, if (NULL != hh->hcb)
response_code, hh->hcb (hh->hcb_cls,
ec, response_code,
0LLU, ec,
NULL, 0LLU,
j); NULL,
j);
TALER_BANK_debit_history_cancel (hh); TALER_BANK_debit_history_cancel (hh);
} }