[GNUnet-SVN] r13749 - in gnunet/src: arm core

[gnunet]

Author: grothoff
Date: 2010-11-19 13:31:15 +0100 (Fri, 19 Nov 2010)
New Revision: 13749

Modified:
   gnunet/src/arm/arm_api.c
   gnunet/src/core/core_api.c
Log:
fixing 1622

Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c    2010-11-19 12:31:00 UTC (rev 13748)
+++ gnunet/src/arm/arm_api.c    2010-11-19 12:31:15 UTC (rev 13749)
@@ -467,6 +467,7 @@
     }
   if (pos->callback != NULL)
     pos->callback (pos->cls, GNUNET_YES);
+  GNUNET_free (proc);
   GNUNET_free (pos);
 }
 

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2010-11-19 12:31:00 UTC (rev 13748)
+++ gnunet/src/core/core_api.c  2010-11-19 12:31:15 UTC (rev 13749)
@@ -464,6 +464,14 @@
 {
   struct ControlMessage *cm;
 
+  while (NULL != (cm = h->pending_head))
+    {
+      GNUNET_CONTAINER_DLL_remove (h->pending_head,
+                                  h->pending_tail,
+                                  cm);      
+      cm->cont (cm->cont_cls, NULL);
+      GNUNET_free (cm);
+    }
   if (h->client != NULL)
     {
       GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
@@ -472,15 +480,8 @@
                                             &disconnect_and_free_peer_entry,
                                             h);
     }
+  GNUNET_assert (h->pending_head == NULL);
   h->currently_down = GNUNET_YES;
-  while (NULL != (cm = h->pending_head))
-    {
-      GNUNET_CONTAINER_DLL_remove (h->pending_head,
-                                  h->pending_tail,
-                                  cm);      
-      cm->cont (cm->cont_cls, NULL);
-      GNUNET_free (cm);
-    }
   GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
   h->retry_backoff = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS,
                                               h->retry_backoff);