fix infinite loop in GET /orders/ if exchange refund returns error

1 files changed, 12 insertions, 1 deletions

diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c b/src/backend/taler-merchant-httpd_get-orders-ID.c
index 25e96310..f2ce62e0 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -816,8 +816,8 @@ process_refunds_cb (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Found refund of %s for coin %s with reason `%s' in database\n",
-              TALER_B2S (coin_pub),
               TALER_amount2s (refund_amount),
+              TALER_B2S (coin_pub),
               reason);
   cr = GNUNET_new (struct CoinRefund);
   cr->refund_serial = refund_serial;
@@ -1225,6 +1225,16 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
     }
   }
 
+  /* Before we reset the refunds, make sure we notify the client in the case
+     of a non-200 status from the exchange. */
+  for (struct CoinRefund *cr = god->cr_head;
+       NULL != cr;
+       cr = cr->next)
+  {
+    if (MHD_HTTP_OK != cr->exchange_status)
+      goto REPLY;
+  }
+
   /* At this point, we know the contract was paid. Let's check for
      refunds. First, clear away refunds found from previous invocations. */
   rf_cleanup (god);
@@ -1315,6 +1325,7 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh,
   }
 
   /* All operations done, build final response */
+REPLY:
   {
     json_t *ra;