diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-04-15 12:20:00 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-04-15 12:20:00 +0200 |
| commit | 202827ebdaafdf33b78c202bcbb6917dd65dd1c1 (patch) | |
| tree | b5689b28c58e1698dff0f296dbe78ec432430512 /src/exchange-lib/exchange_api_handle.c | |
| parent | aea82d3dcde94b68a70a65be8736cf7ad437b0c7 (diff) | |
| parent | 1b3bf1a00126baffd016676ad1d668637b8b2efe (diff) | |
| download | exchange-202827ebdaafdf33b78c202bcbb6917dd65dd1c1.tar.xz | |
merging Florian's changes with my wire changes
Diffstat (limited to 'src/exchange-lib/exchange_api_handle.c')
| -rw-r--r-- | src/exchange-lib/exchange_api_handle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/exchange-lib/exchange_api_handle.c b/src/exchange-lib/exchange_api_handle.c index e3f8314f4..026fa87aa 100644 --- a/src/exchange-lib/exchange_api_handle.c +++ b/src/exchange-lib/exchange_api_handle.c @@ -867,7 +867,7 @@ keys_completed_cb (void *cls, { /* offsets will map 1:1 */ unsigned int off = aold->denom_keys[j] - kd_old.denom_keys; - + /* FIXME(#5315): this should not be an assert! */ GNUNET_assert (off < kd_old.num_denom_keys); anew->denom_keys[j] = &kd.denom_keys[off]; } @@ -1127,7 +1127,7 @@ request_keys (struct TALER_EXCHANGE_Handle *exchange) GNUNET_assert (NULL == exchange->kr); kr = GNUNET_new (struct KeysRequest); kr->exchange = exchange; - if (GNUNET_YES == MAH_handle_is_ready (exchange)) + if (GNUNET_YES == MAH_handle_is_ready (exchange) && !TALER_EXCHANGE_API_DISABLE_CHERRYPICKING) { char *arg; |