[taler-merchant] branch master updated: fix crash on exit: resuming would skip list entries

[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 9d913c14 fix crash on exit: resuming would skip list entries
9d913c14 is described below

commit 9d913c147b7a74fd24cac9d21e0064f0039aa919
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon May 17 21:36:24 2021 +0200

    fix crash on exit: resuming would skip list entries
---
 src/backend/taler-merchant-httpd_private-post-reserves.c  | 5 ++++-
 src/backend/taler-merchant-httpd_private-post-transfers.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_private-post-reserves.c 
b/src/backend/taler-merchant-httpd_private-post-reserves.c
index e2243936..f4c001b1 100644
--- a/src/backend/taler-merchant-httpd_private-post-reserves.c
+++ b/src/backend/taler-merchant-httpd_private-post-reserves.c
@@ -120,10 +120,13 @@ static struct PostReserveContext *rc_tail;
 void
 TMH_force_rc_resume ()
 {
+  struct PostReserveContext *rcn;
+
   for (struct PostReserveContext *rc = rc_head;
        NULL != rc;
-       rc = rc->next)
+       rc = rcn)
   {
+    rcn = rc->next;
     if (rc->suspended)
     {
       rc->suspended = false;
diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c 
b/src/backend/taler-merchant-httpd_private-post-transfers.c
index 26db9118..505ca33f 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -33,7 +33,7 @@
  */
 #define TRANSFER_GENERIC_TIMEOUT (GNUNET_TIME_relative_multiply ( \
                                     GNUNET_TIME_UNIT_SECONDS, \
-                                    30))
+                                    1))
 
 /**
  * How often do we retry the simple INSERT database transaction?

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