[taler-merchant] branch master updated (e767cbf -> becdce5)

[gnunet]

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

dold pushed a change to branch master
in repository merchant.

    from e767cbf  remove wrong/misleading comment
     new 0170208  use GNUNET_is_zero correctly (confusing return value!)
     new becdce5  zero out claim token

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/backend/taler-merchant-httpd_get-orders-ID.c | 2 +-
 src/backenddb/plugin_merchantdb_postgres.c       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c 
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 8d75bbf..324af10 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -689,7 +689,7 @@ TMH_make_taler_pay_uri (struct MHD_Connection *con,
   GNUNET_buffer_write_path (&buf,
                             (session_id == NULL) ? "" : session_id);
   if ((NULL != claim_token) &&
-      (GNUNET_NO == GNUNET_is_zero (claim_token)))
+      (0 != GNUNET_is_zero (claim_token)))
   {
     GNUNET_buffer_write_str (&buf,
                              "&c=");
diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index d0c3636..52d7b99 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -1154,6 +1154,8 @@ postgres_lookup_order (void *cls,
     /* just to be safe: NULL it */
     if (NULL != contract_terms)
       *contract_terms = NULL;
+    if (NULL != claim_token)
+      *claim_token = (struct TALER_ClaimTokenP) { 0 };
   }
   return qs;
 }

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