[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21884 - in gnunet/src/gns: . nss
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21884 - in gnunet/src/gns: . nss |
Date: |
Mon, 11 Jun 2012 14:35:36 +0200 |
Author: schanzen
Date: 2012-06-11 14:35:36 +0200 (Mon, 11 Jun 2012)
New Revision: 21884
Modified:
gnunet/src/gns/gnunet-gns-proxy.c
gnunet/src/gns/nss/nss_gns_query.c
Log:
-coverity, cleanup
Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c 2012-06-11 12:16:27 UTC (rev 21883)
+++ gnunet/src/gns/gnunet-gns-proxy.c 2012-06-11 12:35:36 UTC (rev 21884)
@@ -1040,11 +1040,13 @@
"Get authority failed!\n");
strcpy (ctask->authority, "");
}
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Get authority yielded %s\n", auth_name);
+ strcpy (ctask->authority, auth_name);
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Get authority yielded %s\n", auth_name);
- strcpy (ctask->authority, auth_name);
-
GNUNET_GNS_lookup_zone (gns_handle,
ctask->host,
&local_gns_zone,
@@ -1615,11 +1617,9 @@
int ret;
unsigned int serial;
- unsigned int bits;
size_t key_buf_size;
size_t cert_buf_size;
gnutls_x509_crt_t request;
- gnutls_x509_privkey_t rsa;
time_t etime;
struct tm *tm_data;
Modified: gnunet/src/gns/nss/nss_gns_query.c
===================================================================
--- gnunet/src/gns/nss/nss_gns_query.c 2012-06-11 12:16:27 UTC (rev 21883)
+++ gnunet/src/gns/nss/nss_gns_query.c 2012-06-11 12:35:36 UTC (rev 21884)
@@ -46,19 +46,31 @@
line[strlen(line)-1] = '\0';
if (af == AF_INET)
{
- inet_pton(af, line, &(u->data.ipv4[u->count++]));
- u->data_len += sizeof(ipv4_address_t);
+ if (inet_pton(af, line, &(u->data.ipv4[u->count++])))
+ u->data_len += sizeof(ipv4_address_t);
+ else
+ {
+ fclose (p);
+ free (cmd);
+ return -1;
+ }
}
else if ((af == AF_INET6))
{
- inet_pton(af, line, &(u->data.ipv6[u->count++]));
- u->data_len += sizeof(ipv6_address_t);
+ if (inet_pton(af, line, &(u->data.ipv6[u->count++])))
+ u->data_len += sizeof(ipv6_address_t);
+ else
+ {
+ fclose (p);
+ free (cmd);
+ return -1;
+ }
}
}
}
+ fclose (p);
}
- fclose(p);
- free(cmd);
+ free (cmd);
return 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21884 - in gnunet/src/gns: . nss,
gnunet <=