peerstore: memory leak fixes

4 files changed, 40 insertions, 3 deletions

diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c
index 82961f685..febebc63a 100644
--- a/src/peerstore/gnunet-service-peerstore.c
+++ b/src/peerstore/gnunet-service-peerstore.c
@@ -155,6 +155,7 @@ int record_iterator(void *cls,
       record->expiry,
       GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_RECORD);
   GNUNET_SERVER_notification_context_unicast(nc, client, (struct GNUNET_MessageHeader *)srm, GNUNET_NO);
+  GNUNET_free(srm);
   return GNUNET_YES;
 }
 
@@ -190,6 +191,7 @@ int watch_notifier_it(void *cls,
       GNUNET_MESSAGE_TYPE_PEERSTORE_WATCH_RECORD);
   GNUNET_SERVER_notification_context_unicast(nc, client,
       (const struct GNUNET_MessageHeader *)srm, GNUNET_NO);
+  GNUNET_free(srm);
   return GNUNET_YES;
 }
 
@@ -291,12 +293,14 @@ void handle_iterate (void *cls,
     endmsg->size = htons(sizeof(struct GNUNET_MessageHeader));
     endmsg->type = htons(GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_END);
     GNUNET_SERVER_notification_context_unicast(nc, client, endmsg, GNUNET_NO);
+    GNUNET_free(endmsg);
+    GNUNET_SERVER_receive_done(client, GNUNET_OK);
   }
   else
   {
     GNUNET_SERVER_receive_done(client, GNUNET_SYSERR);
   }
-  GNUNET_free(record); /* FIXME: destroy record */
+  PEERSTORE_destroy_record(record);
 }
 
 /**
@@ -323,8 +327,8 @@ void handle_store (void *cls,
       || NULL == record->peer
       || NULL == record->key)
   {
-    /* FIXME: Destroy record */
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Full key not supplied in client store request\n");
+    PEERSTORE_destroy_record(record);
     GNUNET_SERVER_receive_done(client, GNUNET_SYSERR);
     return;
   }
@@ -341,13 +345,14 @@ void handle_store (void *cls,
       record->value_size,
       *record->expiry))
   {
-    /* FIXME: Destroy record */
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to store requested value, sqlite database error.");
+    PEERSTORE_destroy_record(record);
     GNUNET_SERVER_receive_done(client, GNUNET_SYSERR);
     return;
   }
   GNUNET_SERVER_receive_done(client, GNUNET_OK);
   watch_notifier(record);
+  PEERSTORE_destroy_record(record);
 }
 
 /**
diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c
index 2b62abf19..eeaa3144c 100644
--- a/src/peerstore/peerstore_common.c
+++ b/src/peerstore/peerstore_common.c
@@ -233,3 +233,26 @@ PEERSTORE_parse_record_message(const struct GNUNET_MessageHeader *message)
 
   return record;
 }
+
+/**
+ * Free any memory allocated for this record
+ *
+ * @param record
+ */
+void PEERSTORE_destroy_record(struct GNUNET_PEERSTORE_Record *record)
+{
+  if(NULL != record->sub_system)
+    GNUNET_free(record->sub_system);
+  if(NULL != record->peer)
+    GNUNET_free(record->peer);
+  if(NULL != record->key)
+    GNUNET_free(record->key);
+  if(NULL != record->value)
+  {
+    GNUNET_free(record->value);
+    record->value = 0;
+  }
+  if(NULL != record->expiry)
+    GNUNET_free(record->expiry);
+  GNUNET_free(record);
+}
diff --git a/src/peerstore/peerstore_common.h b/src/peerstore/peerstore_common.h
index 20cb9c0e7..dae2b437b 100644
--- a/src/peerstore/peerstore_common.h
+++ b/src/peerstore/peerstore_common.h
@@ -86,3 +86,10 @@ PEERSTORE_create_record_mq_envelope(const char *sub_system,
  */
 struct GNUNET_PEERSTORE_Record *
 PEERSTORE_parse_record_message(const struct GNUNET_MessageHeader *message);
+
+/**
+ * Free any memory allocated for this record
+ *
+ * @param record
+ */
+void PEERSTORE_destroy_record(struct GNUNET_PEERSTORE_Record *record);
diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c
index 8d35466de..8705ce188 100644
--- a/src/peerstore/plugin_peerstore_sqlite.c
+++ b/src/peerstore/plugin_peerstore_sqlite.c
@@ -215,6 +215,8 @@ peerstore_sqlite_iterate_records (void *cls,
       iter (iter_cls,
           ret,
           NULL);
+    GNUNET_free(ret->expiry);
+    GNUNET_free(ret);
   }
   if (SQLITE_DONE != sret)
   {