[GNUnet-SVN] r33395 - gnunet/src/scalarproduct

[gnunet]

Author: cfuchs
Date: 2014-05-26 17:25:17 +0200 (Mon, 26 May 2014)
New Revision: 33395

Modified:
   gnunet/src/scalarproduct/gnunet-service-scalarproduct.c
Log:
- removed double-free after set has freed its set already

Modified: gnunet/src/scalarproduct/gnunet-service-scalarproduct.c
===================================================================
--- gnunet/src/scalarproduct/gnunet-service-scalarproduct.c     2014-05-26 
14:59:54 UTC (rev 33394)
+++ gnunet/src/scalarproduct/gnunet-service-scalarproduct.c     2014-05-26 
15:25:17 UTC (rev 33395)
@@ -1239,6 +1239,7 @@
 
   case GNUNET_SET_STATUS_DONE:
     s->intersection_op = NULL;
+    s->intersection_set = NULL;
 
     if (2 > s->used_element_count)
     {
@@ -1808,8 +1809,8 @@
       GNUNET_free (elem);
       continue;
     }
-    set_elem.data = &elements[i].key;
-    set_elem.size = htons (sizeof (elements[i].key));
+    set_elem.data = &elem->key;
+    set_elem.size = htons (sizeof (elem->key));
     set_elem.type = htons (0); /* do we REALLY need this? */
     GNUNET_SET_add_element (s->intersection_set, &set_elem, NULL, NULL);
     s->used_element_count++;