diff options
-rw-r--r-- | src/identity-provider/gnunet-service-identity-provider.c | 15 | ||||
-rw-r--r-- | src/jsonapi/jsonapi_resource.c | 2 | ||||
-rw-r--r-- | src/namecache/plugin_namecache_flat.c | 1 | ||||
-rw-r--r-- | src/namestore/plugin_namestore_flat.c | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index 2c400dc9c..a97955aa6 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c | |||
@@ -597,6 +597,7 @@ token_collect (void *cls, | |||
597 | const struct GNUNET_GNSRECORD_Data *token_record; | 597 | const struct GNUNET_GNSRECORD_Data *token_record; |
598 | const struct GNUNET_GNSRECORD_Data *token_metadata_record; | 598 | const struct GNUNET_GNSRECORD_Data *token_metadata_record; |
599 | struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key; | 599 | struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key; |
600 | struct GNUNET_CRYPTO_EcdhePrivateKey *priv_key; | ||
600 | 601 | ||
601 | //There should be only a single record for a token under a label | 602 | //There should be only a single record for a token under a label |
602 | if (2 != rd_count) | 603 | if (2 != rd_count) |
@@ -627,8 +628,9 @@ token_collect (void *cls, | |||
627 | } | 628 | } |
628 | 629 | ||
629 | //Get metadata and decrypt token | 630 | //Get metadata and decrypt token |
630 | ecdhe_privkey = *((struct GNUNET_CRYPTO_EcdhePrivateKey *)token_metadata_record->data); | 631 | priv_key = (struct GNUNET_CRYPTO_EcdhePrivateKey *)token_metadata_record->data; |
631 | aud_key = (struct GNUNET_CRYPTO_EcdsaPublicKey *)&(&ecdhe_privkey)[1]; | 632 | ecdhe_privkey = *priv_key; |
633 | aud_key = (struct GNUNET_CRYPTO_EcdsaPublicKey *)&priv_key[1]; | ||
632 | scopes = GNUNET_strdup ((char*) aud_key+sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)); | 634 | scopes = GNUNET_strdup ((char*) aud_key+sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)); |
633 | 635 | ||
634 | token_parse2 (token_record->data, | 636 | token_parse2 (token_record->data, |
@@ -717,10 +719,11 @@ attribute_collect (void *cls, | |||
717 | GNUNET_CONTAINER_DLL_insert (attr->val_head, | 719 | GNUNET_CONTAINER_DLL_insert (attr->val_head, |
718 | attr->val_tail, | 720 | attr->val_tail, |
719 | val); | 721 | val); |
720 | GNUNET_CONTAINER_multihashmap_put (ego_entry->attr_map, | 722 | GNUNET_assert (GNUNET_OK == |
721 | &key, | 723 | GNUNET_CONTAINER_multihashmap_put (ego_entry->attr_map, |
722 | attr, | 724 | &key, |
723 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 725 | attr, |
726 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | ||
724 | } | 727 | } |
725 | 728 | ||
726 | GNUNET_NAMESTORE_zone_iterator_next (ns_it); | 729 | GNUNET_NAMESTORE_zone_iterator_next (ns_it); |
diff --git a/src/jsonapi/jsonapi_resource.c b/src/jsonapi/jsonapi_resource.c index 09217279a..85bca10ee 100644 --- a/src/jsonapi/jsonapi_resource.c +++ b/src/jsonapi/jsonapi_resource.c | |||
@@ -52,7 +52,7 @@ GNUNET_JSONAPI_resource_to_json (const struct GNUNET_JSONAPI_Resource *res, | |||
52 | default: | 52 | default: |
53 | res_json = json_array (); | 53 | res_json = json_array (); |
54 | rel_res = NULL; | 54 | rel_res = NULL; |
55 | for (rel_res = rel_res->relationship->res_list_head; | 55 | for (rel_res = res->relationship->res_list_head; |
56 | rel_res != NULL; | 56 | rel_res != NULL; |
57 | rel_res = rel_res->next) | 57 | rel_res = rel_res->next) |
58 | { | 58 | { |
diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c index c348de63b..66ab776e3 100644 --- a/src/namecache/plugin_namecache_flat.c +++ b/src/namecache/plugin_namecache_flat.c | |||
@@ -129,6 +129,7 @@ database_setup (struct Plugin *plugin) | |||
129 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 129 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
130 | _("Unable to get filesize: %s.\n"), | 130 | _("Unable to get filesize: %s.\n"), |
131 | afsdir); | 131 | afsdir); |
132 | GNUNET_DISK_file_close (fh); | ||
132 | return GNUNET_SYSERR; | 133 | return GNUNET_SYSERR; |
133 | } | 134 | } |
134 | 135 | ||
diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c index 869aa3d9f..4f5034d26 100644 --- a/src/namestore/plugin_namestore_flat.c +++ b/src/namestore/plugin_namestore_flat.c | |||
@@ -192,7 +192,7 @@ database_setup (struct Plugin *plugin) | |||
192 | return GNUNET_SYSERR; | 192 | return GNUNET_SYSERR; |
193 | } | 193 | } |
194 | 194 | ||
195 | buffer = GNUNET_malloc (size) + 1; | 195 | buffer = GNUNET_malloc (size + 1); |
196 | if (GNUNET_SYSERR == | 196 | if (GNUNET_SYSERR == |
197 | GNUNET_DISK_file_read (fh, | 197 | GNUNET_DISK_file_read (fh, |
198 | buffer, | 198 | buffer, |
@@ -201,8 +201,11 @@ database_setup (struct Plugin *plugin) | |||
201 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 201 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
202 | _("Unable to read file: %s.\n"), | 202 | _("Unable to read file: %s.\n"), |
203 | afsdir); | 203 | afsdir); |
204 | GNUNET_free (buffer); | ||
205 | GNUNET_DISK_file_close (fh); | ||
204 | return GNUNET_SYSERR; | 206 | return GNUNET_SYSERR; |
205 | } | 207 | } |
208 | buffer[size] = '\0'; | ||
206 | GNUNET_DISK_file_close (fh); | 209 | GNUNET_DISK_file_close (fh); |
207 | 210 | ||
208 | if (0 < size) | 211 | if (0 < size) |
@@ -341,6 +344,7 @@ store_and_free_entries (void *cls, | |||
341 | line, | 344 | line, |
342 | strlen (line)); | 345 | strlen (line)); |
343 | 346 | ||
347 | GNUNET_free (line); | ||
344 | GNUNET_free (entry->private_key); | 348 | GNUNET_free (entry->private_key); |
345 | GNUNET_free (entry->label); | 349 | GNUNET_free (entry->label); |
346 | GNUNET_free (entry->record_data); | 350 | GNUNET_free (entry->record_data); |