From: David Barksdale <amatus@amatus.name>
Date: Mon, 30 Jan 2017 02:07:02 +0000 (-0600)
Subject: Save next pointer in case mqm gets freed
X-Git-Tag: taler-0.2.1~245
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4d0522fd416da83f77475e2bb8351a7b5b72cc3;p=oweals%2Fgnunet.git

Save next pointer in case mqm gets freed
---

diff --git a/src/cadet/gnunet-service-cadet-new_peer.c b/src/cadet/gnunet-service-cadet-new_peer.c
index cc13f6da6..8db375510 100644
--- a/src/cadet/gnunet-service-cadet-new_peer.c
+++ b/src/cadet/gnunet-service-cadet-new_peer.c
@@ -527,10 +527,12 @@ GCP_set_mq (struct CadetPeer *cp,
        GCP_2s (cp),
        mq);
   cp->core_mq = mq;
-  for (struct GCP_MessageQueueManager *mqm = cp->mqm_head;
+  for (struct GCP_MessageQueueManager *mqm = cp->mqm_head, *next;
        NULL != mqm;
-       mqm = mqm->next)
+       mqm = next)
   {
+    /* Save next pointer in case mqm gets freed by the callback */
+    next = mqm->next;
     if (NULL == mq)
     {
       if (NULL != mqm->env)