[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20367 - gnunet/src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20367 - gnunet/src/namestore |
Date: |
Thu, 8 Mar 2012 15:01:52 +0100 |
Author: wachs
Date: 2012-03-08 15:01:52 +0100 (Thu, 08 Mar 2012)
New Revision: 20367
Modified:
gnunet/src/namestore/gnunet-service-namestore.c
gnunet/src/namestore/namestore_api.c
gnunet/src/namestore/test_namestore_api.c
gnunet/src/namestore/test_namestore_api_zone_to_name.c
Log:
- coverity
Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c 2012-03-08 13:49:49 UTC
(rev 20366)
+++ gnunet/src/namestore/gnunet-service-namestore.c 2012-03-08 14:01:52 UTC
(rev 20367)
@@ -1259,7 +1259,7 @@
zir_msg->rd_count = htons (rd_count);
zir_msg->rd_len = htons (rd_ser_len);
zir_msg->signature = *signature;
- GNUNET_assert (NULL == zone_key);
+ GNUNET_assert (NULL != zone_key);
if (zone_key != NULL)
zir_msg->public_key = *zone_key;
memcpy (name_tmp, name, name_len);
Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c 2012-03-08 13:49:49 UTC (rev
20366)
+++ gnunet/src/namestore/namestore_api.c 2012-03-08 14:01:52 UTC (rev
20367)
@@ -262,8 +262,13 @@
/* deserialize records */
struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- GNUNET_NAMESTORE_records_deserialize(rd_len, rd_tmp, rd_count, rd);
+ if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize(rd_len, rd_tmp,
rd_count, rd))
+ {
+ GNUNET_break_op (0);
+ return;
+ }
+
/* reset values if values not contained */
if (contains_sig == GNUNET_NO)
signature = NULL;
@@ -475,7 +480,11 @@
rd_tmp = &name_tmp[name_len];
struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_tmp, rd_count, rd);
+ if (GNUNET_OK != GNUNET_NAMESTORE_records_deserialize(rd_ser_len, rd_tmp,
rd_count, rd))
+ {
+ GNUNET_break_op (0);
+ return;
+ }
if (qe->proc != NULL)
qe->proc (qe->proc_cls, &msg->zone_key, expire, name_tmp, rd_count, rd,
&msg->signature);
Modified: gnunet/src/namestore/test_namestore_api.c
===================================================================
--- gnunet/src/namestore/test_namestore_api.c 2012-03-08 13:49:49 UTC (rev
20366)
+++ gnunet/src/namestore/test_namestore_api.c 2012-03-08 14:01:52 UTC (rev
20367)
@@ -175,6 +175,7 @@
struct GNUNET_CRYPTO_RsaSignature signature;
+ memset (&signature, '\0', sizeof (signature));
struct GNUNET_NAMESTORE_RecordData rd;
rd.expiration = GNUNET_TIME_absolute_get();
Modified: gnunet/src/namestore/test_namestore_api_zone_to_name.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_to_name.c 2012-03-08
13:49:49 UTC (rev 20366)
+++ gnunet/src/namestore/test_namestore_api_zone_to_name.c 2012-03-08
14:01:52 UTC (rev 20367)
@@ -145,7 +145,7 @@
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result found: `%s'\n", n);
- if (0 != strcmp(n, s_name))
+ if ((n == NULL) || (0 != strcmp(n, s_name)))
{
fail = GNUNET_YES;
GNUNET_break (0);
@@ -155,7 +155,7 @@
fail = GNUNET_YES;
GNUNET_break (0);
}
- if (0 != memcmp (zone_key, &pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))
+ if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded))))
{
fail = GNUNET_YES;
GNUNET_break (0);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20367 - gnunet/src/namestore,
gnunet <=