[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37822 - in gnunet/src: identity-provider jsonapi namecache
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37822 - in gnunet/src: identity-provider jsonapi namecache namestore |
Date: |
Mon, 29 Aug 2016 10:20:01 +0200 |
Author: schanzen
Date: 2016-08-29 10:20:01 +0200 (Mon, 29 Aug 2016)
New Revision: 37822
Modified:
gnunet/src/identity-provider/gnunet-service-identity-provider.c
gnunet/src/jsonapi/jsonapi_resource.c
gnunet/src/namecache/plugin_namecache_flat.c
gnunet/src/namestore/plugin_namestore_flat.c
Log:
- fix coverity
Modified: gnunet/src/identity-provider/gnunet-service-identity-provider.c
===================================================================
--- gnunet/src/identity-provider/gnunet-service-identity-provider.c
2016-08-28 23:09:44 UTC (rev 37821)
+++ gnunet/src/identity-provider/gnunet-service-identity-provider.c
2016-08-29 08:20:01 UTC (rev 37822)
@@ -597,6 +597,7 @@
const struct GNUNET_GNSRECORD_Data *token_record;
const struct GNUNET_GNSRECORD_Data *token_metadata_record;
struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key;
+ struct GNUNET_CRYPTO_EcdhePrivateKey *priv_key;
//There should be only a single record for a token under a label
if (2 != rd_count)
@@ -627,8 +628,9 @@
}
//Get metadata and decrypt token
- ecdhe_privkey = *((struct GNUNET_CRYPTO_EcdhePrivateKey
*)token_metadata_record->data);
- aud_key = (struct GNUNET_CRYPTO_EcdsaPublicKey *)&(&ecdhe_privkey)[1];
+ priv_key = (struct GNUNET_CRYPTO_EcdhePrivateKey
*)token_metadata_record->data;
+ ecdhe_privkey = *priv_key;
+ aud_key = (struct GNUNET_CRYPTO_EcdsaPublicKey *)&priv_key[1];
scopes = GNUNET_strdup ((char*) aud_key+sizeof (struct
GNUNET_CRYPTO_EcdsaPublicKey));
token_parse2 (token_record->data,
@@ -717,10 +719,11 @@
GNUNET_CONTAINER_DLL_insert (attr->val_head,
attr->val_tail,
val);
- GNUNET_CONTAINER_multihashmap_put (ego_entry->attr_map,
- &key,
- attr,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (ego_entry->attr_map,
+ &key,
+ attr,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
}
GNUNET_NAMESTORE_zone_iterator_next (ns_it);
Modified: gnunet/src/jsonapi/jsonapi_resource.c
===================================================================
--- gnunet/src/jsonapi/jsonapi_resource.c 2016-08-28 23:09:44 UTC (rev
37821)
+++ gnunet/src/jsonapi/jsonapi_resource.c 2016-08-29 08:20:01 UTC (rev
37822)
@@ -52,7 +52,7 @@
default:
res_json = json_array ();
rel_res = NULL;
- for (rel_res = rel_res->relationship->res_list_head;
+ for (rel_res = res->relationship->res_list_head;
rel_res != NULL;
rel_res = rel_res->next)
{
Modified: gnunet/src/namecache/plugin_namecache_flat.c
===================================================================
--- gnunet/src/namecache/plugin_namecache_flat.c 2016-08-28 23:09:44 UTC
(rev 37821)
+++ gnunet/src/namecache/plugin_namecache_flat.c 2016-08-29 08:20:01 UTC
(rev 37822)
@@ -129,6 +129,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Unable to get filesize: %s.\n"),
afsdir);
+ GNUNET_DISK_file_close (fh);
return GNUNET_SYSERR;
}
Modified: gnunet/src/namestore/plugin_namestore_flat.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_flat.c 2016-08-28 23:09:44 UTC
(rev 37821)
+++ gnunet/src/namestore/plugin_namestore_flat.c 2016-08-29 08:20:01 UTC
(rev 37822)
@@ -192,7 +192,7 @@
return GNUNET_SYSERR;
}
- buffer = GNUNET_malloc (size) + 1;
+ buffer = GNUNET_malloc (size + 1);
if (GNUNET_SYSERR ==
GNUNET_DISK_file_read (fh,
buffer,
@@ -201,8 +201,11 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Unable to read file: %s.\n"),
afsdir);
+ GNUNET_free (buffer);
+ GNUNET_DISK_file_close (fh);
return GNUNET_SYSERR;
}
+ buffer[size] = '\0';
GNUNET_DISK_file_close (fh);
if (0 < size)
@@ -341,6 +344,7 @@
line,
strlen (line));
+ GNUNET_free (line);
GNUNET_free (entry->private_key);
GNUNET_free (entry->label);
GNUNET_free (entry->record_data);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37822 - in gnunet/src: identity-provider jsonapi namecache namestore,
gnunet <=