[taler-exchange] branch master updated: aml: handle NULL values in DB for justification and properties

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new be6fa8255 aml: handle NULL values in DB for justification and 
properties
be6fa8255 is described below

commit be6fa8255ea124df6df3d378a8f3fdaaf6fe2e84
Author: Florian Dold <florian@dold.me>
AuthorDate: Wed Aug 21 10:57:09 2024 +0200

    aml: handle NULL values in DB for justification and properties
    
    Fixes #9102
---
 contrib/wallet-core                         |  2 +-
 doc/prebuilt                                |  2 +-
 src/exchangedb/pg_lookup_aml_history.c      |  8 +++++---
 src/exchangedb/pg_lookup_records_by_table.c |  8 +++++---
 src/exchangedb/pg_select_aml_decisions.c    | 10 ++++++----
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/contrib/wallet-core b/contrib/wallet-core
index 5934e007f..4c59144f6 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 5934e007f637bd9834a811e67c0a030d7a59f2c0
+Subproject commit 4c59144f6e2a9b5748de42fa108a3a164cacc4ee
diff --git a/doc/prebuilt b/doc/prebuilt
index c1a885ac1..ab2e09b5a 160000
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@ -1 +1 @@
-Subproject commit c1a885ac1f9d9b2fdef19a976bed01dab4f7d852
+Subproject commit ab2e09b5a3711ab04f1f77f79158cc006cab3195
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",

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.