[GNUnet-SVN] [taler-merchant] branch master updated: work on #5092: be conservative, allow TALER_EXCHANGE_get_keys() to return NULL and treat as error properly

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 3118c34  work on #5092: be conservative, allow 
TALER_EXCHANGE_get_keys() to return NULL and treat as error properly
3118c34 is described below

commit 3118c34652fde180515e0cc37a996dd249369afb
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Sep 9 22:19:48 2017 +0200

    work on #5092: be conservative, allow TALER_EXCHANGE_get_keys() to return 
NULL and treat as error properly
---
 src/backend/taler-merchant-httpd_exchanges.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_exchanges.c 
b/src/backend/taler-merchant-httpd_exchanges.c
index aca9160..4403ec1 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -558,6 +558,7 @@ handle_wire_data (void *cls,
                   const json_t *obj)
 {
   struct Exchange *exchange = cls;
+  const struct TALER_EXCHANGE_Keys *keys;
 
   exchange->wire_request = NULL;
   if (MHD_HTTP_OK != http_status)
@@ -568,11 +569,13 @@ handle_wire_data (void *cls,
                 ec);
     return;
   }
-  if (GNUNET_OK !=
-      TALER_EXCHANGE_wire_get_fees (&TALER_EXCHANGE_get_keys 
(exchange->conn)->master_pub,
-                                    obj,
-                                    &process_wire_fees,
-                                    exchange))
+  keys = TALER_EXCHANGE_get_keys (exchange->conn);
+  if ( (NULL == keys) ||
+       (GNUNET_OK !=
+        TALER_EXCHANGE_wire_get_fees (&keys->master_pub,
+                                      obj,
+                                      &process_wire_fees,
+                                      exchange)) )
   {
     /* Report hard failure to all callbacks! */
     struct TMH_EXCHANGES_FindOperation *fo;

-- 
To stop receiving notification emails like this one, please contact
address@hidden