diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-03-24 18:27:24 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-03-24 18:27:24 +0100 |
| commit | a3ac2587cfee3c8b6e058d4086eea8f5f297e5af (patch) | |
| tree | 61e4e8881d2c7d0952a44f75f08582b852789169 /src/pq/db_pq.c | |
| parent | ec05a64e3e6346ea91b79244a0a69b06afd22562 (diff) | |
| parent | 324bf3f980542cb9f209ee7edc6f142c5c34e5a2 (diff) | |
| download | exchange-a3ac2587cfee3c8b6e058d4086eea8f5f297e5af.tar.gz exchange-a3ac2587cfee3c8b6e058d4086eea8f5f297e5af.tar.bz2 exchange-a3ac2587cfee3c8b6e058d4086eea8f5f297e5af.zip | |
Merge branch 'master' of git.taler.net:/var/git/mint
Diffstat (limited to 'src/pq/db_pq.c')
| -rw-r--r-- | src/pq/db_pq.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/pq/db_pq.c b/src/pq/db_pq.c index bfa929c4e..bbcf002ee 100644 --- a/src/pq/db_pq.c +++ b/src/pq/db_pq.c @@ -181,13 +181,16 @@ TALER_DB_extract_amount_nbo (PGresult *result, r_amount_nbo->value = *(uint32_t *) PQgetvalue (result, row, val_num); r_amount_nbo->fraction = *(uint32_t *) PQgetvalue (result, row, frac_num); - memset (r_amount_nbo->currency, 0, TALER_CURRENCY_LEN); - // FIXME: overflow? - len = PQgetlength (result, row, curr_num); - len = GNUNET_MIN (TALER_CURRENCY_LEN, len); - memcpy (r_amount_nbo->currency, PQgetvalue (result, row, curr_num), len); - r_amount_nbo->currency[TALER_CURRENCY_LEN - 1] = '\0'; - + memset (r_amount_nbo->currency, + 0, + TALER_CURRENCY_LEN); + len = GNUNET_MIN (TALER_CURRENCY_LEN - 1, + PQgetlength (result, row, curr_num)); + memcpy (r_amount_nbo->currency, + PQgetvalue (result, + row, + curr_num), + len); return GNUNET_OK; } |