diff options
| m--------- | contrib/wallet-core | 0 | ||||
| m--------- | doc/prebuilt | 0 | ||||
| -rw-r--r-- | src/exchangedb/pg_lookup_aml_history.c | 8 | ||||
| -rw-r--r-- | src/exchangedb/pg_lookup_records_by_table.c | 8 | ||||
| -rw-r--r-- | src/exchangedb/pg_select_aml_decisions.c | 10 |
5 files changed, 16 insertions, 10 deletions
diff --git a/contrib/wallet-core b/contrib/wallet-core -Subproject 5934e007f637bd9834a811e67c0a030d7a59f2c +Subproject 4c59144f6e2a9b5748de42fa108a3a164cacc4e diff --git a/doc/prebuilt b/doc/prebuilt -Subproject c1a885ac1f9d9b2fdef19a976bed01dab4f7d85 +Subproject ab2e09b5a3711ab04f1f77f79158cc006cab319 diff --git a/src/exchangedb/pg_lookup_aml_history.c b/src/exchangedb/pg_lookup_aml_history.c index 0eab9a2a2..4a38f8bd7 100644 --- a/src/exchangedb/pg_lookup_aml_history.c +++ b/src/exchangedb/pg_lookup_aml_history.c @@ -76,7 +76,7 @@ handle_aml_entry (void *cls, char *justification; struct TALER_AmlOfficerPublicKeyP decider_pub; json_t *jproperties; - json_t *jnew_rules; + json_t *jnew_rules = NULL; bool to_investigate; bool is_active; struct GNUNET_PQ_ResultSpec rs[] = { @@ -86,8 +86,10 @@ handle_aml_entry (void *cls, &justification), GNUNET_PQ_result_spec_auto_from_type ("decider_pub", &decider_pub), - TALER_PQ_result_spec_json ("jproperties", - &jproperties), + GNUNET_PQ_result_spec_allow_null ( + TALER_PQ_result_spec_json ("jproperties", + &jproperties), + NULL), TALER_PQ_result_spec_json ("jnew_rules", &jnew_rules), GNUNET_PQ_result_spec_bool ("to_investigate", diff --git a/src/exchangedb/pg_lookup_records_by_table.c b/src/exchangedb/pg_lookup_records_by_table.c index cbd972424..52f64cf91 100644 --- a/src/exchangedb/pg_lookup_records_by_table.c +++ b/src/exchangedb/pg_lookup_records_by_table.c @@ -2783,9 +2783,11 @@ lrbt_cb_table_legitimization_outcomes (void *cls, GNUNET_PQ_result_spec_timestamp ( "expiration_time", &td.details.legitimization_outcomes.expiration_time), - TALER_PQ_result_spec_json ( - "jproperties", - &td.details.legitimization_outcomes.properties), + GNUNET_PQ_result_spec_allow_null ( + TALER_PQ_result_spec_json ( + "jproperties", + &td.details.legitimization_outcomes.properties), + NULL), GNUNET_PQ_result_spec_bool ( "to_investigate_id", &td.details.legitimization_outcomes.to_investigate), diff --git a/src/exchangedb/pg_select_aml_decisions.c b/src/exchangedb/pg_select_aml_decisions.c index c817e443f..4c488b352 100644 --- a/src/exchangedb/pg_select_aml_decisions.c +++ b/src/exchangedb/pg_select_aml_decisions.c @@ -73,10 +73,10 @@ handle_aml_result (void *cls, { struct TALER_PaytoHashP h_payto; uint64_t rowid; - char *justification; + char *justification = NULL; struct GNUNET_TIME_Timestamp decision_time; struct GNUNET_TIME_Absolute expiration_time; - json_t *jproperties; + json_t *jproperties = NULL; bool to_investigate; bool is_active; json_t *account_rules; @@ -93,8 +93,10 @@ handle_aml_result (void *cls, &decision_time), GNUNET_PQ_result_spec_absolute_time ("expiration_time", &expiration_time), - TALER_PQ_result_spec_json ("jproperties", - &jproperties), + GNUNET_PQ_result_spec_allow_null ( + TALER_PQ_result_spec_json ("jproperties", + &jproperties), + NULL), TALER_PQ_result_spec_json ("jnew_rules", &account_rules), GNUNET_PQ_result_spec_bool ("to_investigate", |