[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated (1fee963ef -> 9fc7ff92a)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] branch master updated (1fee963ef -> 9fc7ff92a) |
|
Date: |
Fri, 10 Mar 2017 18:18:44 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository gnunet.
from 1fee963ef fix link error
new 121556dc8 fix use of uninitialized (shadow-issue) expiration
new 5994e29dc make compiler happy
new adc35f6e8 make sure 'err' is initialized on all error paths
new 30d691f57 handle case 'diff' is NULL - fixes NPE
new 71fb288ad fix comment
new 6329bd3a3 properly handle error on empty queue
new cc149d0c2 fix memory leak
new 8939dc23b fix memory leak
new 287be62e6 fix memory leak
new db8414f5f fix memory leak
new fb5328f88 fix double-free
new 5199de027 fix ICMP IPv4/IPv6 type conversion logic
new 747694c47 prevent division by zero
new 37befa074 fix double-free
new 70007393f add assertion to make static analysis happy
new 07c15041f disambiguate enum type of value
new 1a2fad47b add assertion to make static analysis happy
new ee232f9c1 fix integer overflow test to actually work
new ffff35036 properly detect and handle parse error
new 71d41835b fix out-of-bounds case in parser
new 4480c9f12 remove redundant condition in assertion
new fc9f21e10 check return value from dup2
new 32777186f check return value from GNUNET_program_run
new 1bd62e957 fix comment
new cfb50789b use correct channel when switching
new d773b6f69 add assertion to make static analysis happy
new ec941a96c add assertion to make static analysis happy
new 9fc7ff92a add assertion to make static analysis happy
The 28 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/ats-tests/gnunet-ats-sim.c | 14 ++++---
src/ats-tests/gnunet-solver-eval.c | 18 ++++++---
src/block/bg_bf.c | 1 +
src/cadet/gnunet-service-cadet-new_channel.c | 11 ++++--
src/cadet/gnunet-service-cadet-new_peer.c | 1 +
src/consensus/gnunet-service-consensus.c | 3 +-
src/conversation/gnunet-service-conversation.c | 1 -
src/datastore/datastore_api.c | 6 +--
src/dht/gnunet-dht-put.c | 3 +-
src/gns/plugin_gnsrecord_gns.c | 18 ++++++---
src/nat-auto/gnunet-nat-auto.c | 25 ++++++------
src/nat/gnunet-nat.c | 45 ++++++++++------------
src/nat/gnunet-service-nat_externalip.c | 1 +
src/nat/nat_api.c | 4 ++
src/nat/nat_stun.h | 15 ++++----
src/pt/gnunet-daemon-pt.c | 2 +-
src/testbed/gnunet-service-testbed_oc.c | 2 +-
src/testbed/testbed_api_topology.c | 6 ++-
src/testing/testing.c | 1 +
.../gnunet-transport-certificate-creation.c | 2 +-
src/transport/plugin_transport_udp.c | 2 +-
src/util/service_new.c | 1 +
src/util/socks.c | 15 +++++---
src/vpn/gnunet-service-vpn.c | 5 ++-
24 files changed, 116 insertions(+), 86 deletions(-)
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c
index 56f8f2223..0f32df511 100644
--- a/src/ats-tests/gnunet-ats-sim.c
+++ b/src/ats-tests/gnunet-ats-sim.c
@@ -81,15 +81,19 @@ evaluate (struct GNUNET_TIME_Relative duration_total)
duration = (duration_total.rel_value_us / (1000 * 1000));
+ if (0 == duration)
+ duration = 1;
for (c_m = 0; c_m < e->num_masters; c_m++)
{
mp = &masters_p[c_m];
fprintf (stderr,
- _("Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB
in %u sec. = %u KiB/s\n"),
- mp->no, mp->total_bytes_sent / 1024, duration,
- (mp->total_bytes_sent / 1024) / duration,
- mp->total_bytes_received / 1024, duration,
- (mp->total_bytes_received / 1024) / duration);
+ _("Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u
KiB in %u sec. = %u KiB/s\n"),
+ mp->no, mp->total_bytes_sent / 1024,
+ duration,
+ (mp->total_bytes_sent / 1024) / duration,
+ mp->total_bytes_received / 1024,
+ duration,
+ (mp->total_bytes_received / 1024) / duration);
for (c_s = 0; c_s < e->num_slaves; c_s++)
{
diff --git a/src/ats-tests/gnunet-solver-eval.c
b/src/ats-tests/gnunet-solver-eval.c
index 0e49a3a32..c19afe895 100644
--- a/src/ats-tests/gnunet-solver-eval.c
+++ b/src/ats-tests/gnunet-solver-eval.c
@@ -331,12 +331,14 @@ load_episode (struct Experiment *e,
o->pref_type = GNUNET_ATS_PREFERENCE_LATENCY;
else
{
- fprintf (stderr, "Invalid preference in operation %u `%s' in
episode %u\n",
- op_counter, op, cur->id);
+ fprintf (stderr,
+ "Invalid preference in operation %u `%s' in episode
%u\n",
+ op_counter,
+ op,
+ cur->id);
GNUNET_free (type);
GNUNET_free (op_name);
GNUNET_free (op);
- GNUNET_free (pref);
GNUNET_free (sec_name);
GNUNET_free_non_null (pref);
GNUNET_free (o);
@@ -943,8 +945,14 @@ main (int argc, char *argv[])
GNUNET_GETOPT_OPTION_END
};
- GNUNET_PROGRAM_run (argc, argv, argv[0], NULL, options, &run, argv[0]);
+ if (GNUNET_OK !=
+ GNUNET_PROGRAM_run (argc,
+ argv, argv[0],
+ NULL,
+ options,
+ &run, argv[0]))
+ return 1;
return 0;
}
-/* end of file ats-testing-experiment.c*/
+/* end of file gnunet-solver-eval.c*/
diff --git a/src/block/bg_bf.c b/src/block/bg_bf.c
index 1a17ec84e..3e7d38892 100644
--- a/src/block/bg_bf.c
+++ b/src/block/bg_bf.c
@@ -77,6 +77,7 @@ bf_group_serialize_cb (struct GNUNET_BLOCK_Group *bg,
raw,
gi->bf_size))
{
+ GNUNET_free (raw);
GNUNET_break (0);
return GNUNET_SYSERR;
}
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c
b/src/cadet/gnunet-service-cadet-new_channel.c
index 8769601c2..43c905816 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.c
+++ b/src/cadet/gnunet-service-cadet-new_channel.c
@@ -1808,6 +1808,7 @@ GCCH_handle_local_data (struct CadetChannel *ch,
GNUNET_break (0);
return GNUNET_SYSERR;
}
+ GNUNET_assert (NULL != receiver);
ld->ccn = receiver->ccn;
GNUNET_memcpy (&ld[1],
buf,
@@ -1916,15 +1917,17 @@ GCCH_handle_local_ack (struct CadetChannel *ch,
GSC_send_to_client (ccc->c,
com->env);
/* Notify sender that we can receive more */
- if (ccc->ccn.channel_of_client ==
- ch->owner->ccn.channel_of_client)
+ if ( (NULL != ch->owner) &&
+ (ccc->ccn.channel_of_client ==
+ ch->owner->ccn.channel_of_client) )
{
to_owner = GNUNET_NO;
}
else
{
- GNUNET_assert (ccc->ccn.channel_of_client ==
- ch->dest->ccn.channel_of_client);
+ GNUNET_assert ( (NULL != ch->dest) &&
+ (ccc->ccn.channel_of_client ==
+ ch->dest->ccn.channel_of_client) );
to_owner = GNUNET_YES;
}
send_ack_to_client (ch,
diff --git a/src/cadet/gnunet-service-cadet-new_peer.c
b/src/cadet/gnunet-service-cadet-new_peer.c
index 350c8efae..29aef6895 100644
--- a/src/cadet/gnunet-service-cadet-new_peer.c
+++ b/src/cadet/gnunet-service-cadet-new_peer.c
@@ -917,6 +917,7 @@ path_heap_cleanup (void *cls)
unused paths around in the hope that we might be able to switch, even
if the number of paths exceeds the threshold.) */
root = GNUNET_CONTAINER_heap_peek (cp->path_heap);
+ GNUNET_assert (NULL != root);
if (NULL !=
GCPP_get_connection (root,
cp,
diff --git a/src/consensus/gnunet-service-consensus.c
b/src/consensus/gnunet-service-consensus.c
index ba84f64a2..7911db8b0 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -905,7 +905,7 @@ cmp_uint64_t (const void *pa, const void *pb)
* in the result set.
*
* @param cls closure
- * @param element a result element, only valid if status is
GNUNET_SET_STATUS_OK
+ * @param element a result element, only valid if status is
#GNUNET_SET_STATUS_OK
* @param current_size current set size
* @param status see enum GNUNET_SET_Status
*/
@@ -1022,6 +1022,7 @@ set_result_cb (void *cls,
"P%u: lower bound %llu\n",
session->local_peer_idx,
(long long) session->lower_bound);
+ GNUNET_free (copy);
}
return;
}
diff --git a/src/conversation/gnunet-service-conversation.c
b/src/conversation/gnunet-service-conversation.c
index f80cc1d11..e61ed44a1 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -779,7 +779,6 @@ handle_cadet_hangup_message (void *cls,
{
case CS_CALLEE_INIT:
GNUNET_break_op (0);
- destroy_line_cadet_channels (ch);
return;
case CS_CALLEE_RINGING:
case CS_CALLEE_CONNECTED:
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index cf7c7bb1a..ef7cd7532 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -323,14 +323,14 @@ mq_error_handler (void *cls,
"MQ error, reconnecting to DATASTORE\n");
do_disconnect (h);
qe = h->queue_head;
+ if (NULL == qe)
+ return;
if (NULL != qe->delay_warn_task)
{
GNUNET_SCHEDULER_cancel (qe->delay_warn_task);
qe->delay_warn_task = NULL;
}
-
- if ( (NULL != qe) &&
- (NULL == qe->env) )
+ if (NULL == qe->env)
{
union QueueContext qc = qe->qc;
uint16_t rt = qe->response_type;
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index 64764cb65..a9ce097d6 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V.
+ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009, 2017 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -148,7 +148,6 @@ run (void *cls,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- struct GNUNET_TIME_Absolute expiration;
enum GNUNET_DHT_RouteOption ro;
cfg = c;
diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c
index 5faca4578..5d611e19e 100644
--- a/src/gns/plugin_gnsrecord_gns.c
+++ b/src/gns/plugin_gnsrecord_gns.c
@@ -279,9 +279,10 @@ gns_string_to_value (void *cls,
}
*data_size = sizeof (struct GNUNET_TUN_GnsVpnRecord) + strlen (s_serv)
+ 1;
*data = vpn = GNUNET_malloc (*data_size);
- if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string ((char*)
s_peer,
- strlen
(s_peer),
-
&vpn->peer.public_key))
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_eddsa_public_key_from_string ((char*) s_peer,
+ strlen (s_peer),
+ &vpn->peer.public_key))
{
GNUNET_free (vpn);
*data_size = 0;
@@ -362,9 +363,14 @@ gns_string_to_value (void *cls,
}
*data_size = sizeof (struct GNUNET_GNSRECORD_ReverseRecord) + strlen
(known_by) + 1;
*data = rev = GNUNET_malloc (*data_size);
- GNUNET_CRYPTO_ecdsa_public_key_from_string (pkey_str,
- strlen (pkey_str),
- &rev->pkey);
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_ecdsa_public_key_from_string (pkey_str,
+ strlen (pkey_str),
+ &rev->pkey))
+ {
+ GNUNET_free (rev);
+ return GNUNET_SYSERR;
+ }
rev->expiration = expiration;
GNUNET_memcpy (&rev[1],
known_by,
diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c
index 9ba81eb5f..5eb0a4be3 100644
--- a/src/nat-auto/gnunet-nat-auto.c
+++ b/src/nat-auto/gnunet-nat-auto.c
@@ -174,6 +174,9 @@ auto_config_cb (void *cls,
GNUNET_NAT_AUTO_status2string (result),
nat_type);
+ if (NULL == diff)
+ return;
+
/* Shortcut: if there are no changes suggested, bail out early. */
if (GNUNET_NO ==
GNUNET_CONFIGURATION_is_dirty (diff))
@@ -186,20 +189,16 @@ auto_config_cb (void *cls,
to the user */
new_cfg = write_cfg ? GNUNET_CONFIGURATION_dup (cfg) : NULL;
- if (NULL != diff)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- _("Suggested configuration changes:\n"));
- GNUNET_CONFIGURATION_iterate_section_values (diff,
- "nat",
- &auto_conf_iter,
- new_cfg);
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ _("Suggested configuration changes:\n"));
+ GNUNET_CONFIGURATION_iterate_section_values (diff,
+ "nat",
+ &auto_conf_iter,
+ new_cfg);
/* If desired, write configuration to file; we write only the
changes to the defaults to keep things compact. */
- if ( (write_cfg) &&
- (NULL != diff) )
+ if (write_cfg)
{
struct GNUNET_CONFIGURATION_Handle *def_cfg;
@@ -298,8 +297,8 @@ run (void *cls,
if (do_auto)
{
ah = GNUNET_NAT_AUTO_autoconfig_start (c,
- &auto_config_cb,
- NULL);
+ &auto_config_cb,
+ NULL);
}
if (use_tcp && use_udp)
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index 1c5850592..04bde5111 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -269,6 +269,10 @@ run (void *cls,
global_ret = 1;
return;
}
+ local_len = 0;
+ local_sa = NULL;
+ remote_len = 0;
+ remote_sa = NULL;
if (NULL != local_addr)
{
local_len = (socklen_t) GNUNET_STRINGS_parse_socket_addr (local_addr,
@@ -279,13 +283,10 @@ run (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"Invalid socket address `%s'\n",
local_addr);
- global_ret = 1;
- return;
+ goto fail_and_shutdown;
}
}
- remote_len = 0;
-
if (NULL != remote_addr)
{
remote_len = GNUNET_STRINGS_parse_socket_addr (remote_addr,
@@ -296,8 +297,7 @@ run (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"Invalid socket address `%s'\n",
remote_addr);
- global_ret = 1;
- return;
+ goto fail_and_shutdown;
}
}
@@ -319,9 +319,7 @@ run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"Use of `-W` only effective in combination with `-i`\n");
- global_ret = 1;
- GNUNET_SCHEDULER_shutdown ();
- return;
+ goto fail_and_shutdown;
}
if (NULL != remote_addr)
@@ -333,17 +331,13 @@ run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"Require IPv4 local address to initiate connection
reversal\n");
- global_ret = 1;
- GNUNET_SCHEDULER_shutdown ();
- return;
+ goto fail_and_shutdown;
}
if (sizeof (struct sockaddr_in) != remote_len)
{
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"Require IPv4 reversal target address\n");
- global_ret = 1;
- GNUNET_SCHEDULER_shutdown ();
- return;
+ goto fail_and_shutdown;
}
GNUNET_assert (AF_INET == local_sa->sa_family);
GNUNET_assert (AF_INET == remote_sa->sa_family);
@@ -372,17 +366,13 @@ run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"Require local address to support STUN requests\n");
- global_ret = 1;
- GNUNET_SCHEDULER_shutdown ();
- return;
+ goto fail_and_shutdown;
}
if (IPPROTO_UDP != proto)
{
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
"STUN only supported over UDP\n");
- global_ret = 1;
- GNUNET_SCHEDULER_shutdown ();
- return;
+ goto fail_and_shutdown;
}
ls = GNUNET_NETWORK_socket_create (af,
SOCK_DGRAM,
@@ -397,17 +387,22 @@ run (void *cls,
GNUNET_a2s (local_sa,
local_len),
STRERROR (errno));
- global_ret = 1;
- GNUNET_SCHEDULER_shutdown ();
- return;
+ goto fail_and_shutdown;
}
rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
ls,
&stun_read_task,
NULL);
}
-
+ GNUNET_free_non_null (remote_sa);
+ GNUNET_free_non_null (local_sa);
test_finished ();
+ return;
+ fail_and_shutdown:
+ global_ret = 1;
+ GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free_non_null (remote_sa);
+ GNUNET_free_non_null (local_sa);
}
diff --git a/src/nat/gnunet-service-nat_externalip.c
b/src/nat/gnunet-service-nat_externalip.c
index 8df6f48a5..f79ff4070 100644
--- a/src/nat/gnunet-service-nat_externalip.c
+++ b/src/nat/gnunet-service-nat_externalip.c
@@ -182,6 +182,7 @@ handle_external_ip (void *cls,
switch (result)
{
case GNUNET_NAT_ERROR_SUCCESS:
+ GNUNET_assert (NULL != addr);
if (addr->s_addr == mini_external_ipv4.s_addr)
return; /* not change */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index dfe7defc9..a0e9f4793 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -429,6 +429,7 @@ GNUNET_NAT_register (const struct
GNUNET_CONFIGURATION_Handle *cfg,
if (sizeof (struct sockaddr_in) != addrlens[i])
{
GNUNET_break (0);
+ GNUNET_free (rm);
return NULL;
}
break;
@@ -436,6 +437,7 @@ GNUNET_NAT_register (const struct
GNUNET_CONFIGURATION_Handle *cfg,
if (sizeof (struct sockaddr_in6) != addrlens[i])
{
GNUNET_break (0);
+ GNUNET_free (rm);
return NULL;
}
break;
@@ -444,12 +446,14 @@ GNUNET_NAT_register (const struct
GNUNET_CONFIGURATION_Handle *cfg,
if (sizeof (struct sockaddr_un) != addrlens[i])
{
GNUNET_break (0);
+ GNUNET_free (rm);
return NULL;
}
break;
#endif
default:
GNUNET_break (0);
+ GNUNET_free (rm);
return NULL;
}
GNUNET_memcpy (off,
diff --git a/src/nat/nat_stun.h b/src/nat/nat_stun.h
index 3e4228875..8d1c2720f 100644
--- a/src/nat/nat_stun.h
+++ b/src/nat/nat_stun.h
@@ -70,7 +70,7 @@ struct stun_addr
* Port number.
*/
uint16_t port;
-
+
/**
* IPv4 address. Should this be "struct in_addr"?
*/
@@ -79,7 +79,7 @@ struct stun_addr
/**
- * STUN message classes
+ * STUN message classes
*/
enum StunClasses {
INVALID_CLASS = 0,
@@ -186,18 +186,19 @@ stun_msg2str (int msg)
static char result[64];
const char *msg_class = NULL;
const char *method = NULL;
- int value;
+ enum StunClasses cvalue;
+ enum StunMethods mvalue;
- value = decode_class (msg);
+ cvalue = decode_class (msg);
for (unsigned int i = 0; classes[i].name; i++)
- if (classes[i].value == value)
+ if (classes[i].value == cvalue)
{
msg_class = classes[i].name;
break;
}
- value = decode_method (msg);
+ mvalue = decode_method (msg);
for (unsigned int i = 0; methods[i].name; i++)
- if (methods[i].value == value)
+ if (methods[i].value == mvalue)
{
method = methods[i].name;
break;
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c
index 54556cc52..9bd1fb16b 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -1015,7 +1015,7 @@ cadet_channel_end_cb (void *cls,
GNUNET_CONTAINER_DLL_insert (alt->receive_queue_head,
alt->receive_queue_tail,
rc);
- GNUNET_MQ_send (GNUNET_CADET_get_mq (exit->cadet_channel),
+ GNUNET_MQ_send (GNUNET_CADET_get_mq (alt->cadet_channel),
GNUNET_MQ_env_copy (rc->env));
}
try_open_exit ();
diff --git a/src/testbed/gnunet-service-testbed_oc.c
b/src/testbed/gnunet-service-testbed_oc.c
index b775f31bd..09849797c 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -371,7 +371,7 @@ GST_cleanup_focc (struct ForwardedOverlayConnectContext
*focc)
/**
* Timeout task for cancelling a forwarded overlay connect connect
*
- * @param cls the ForwardedOverlayConnectContext
+ * @param cls the `struct ForwardedOperationContext`
*/
static void
forwarded_overlay_connect_timeout (void *cls)
diff --git a/src/testbed/testbed_api_topology.c
b/src/testbed/testbed_api_topology.c
index a21a7cf53..544f127a9 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -1147,9 +1147,11 @@ gen_topo_from_file (struct TopologyContext *tc,
other_peer_id);
while (('\n' != data[offset]) && ('|' != data[offset]) && (offset < fs))
offset++;
- if ('\n' == data[offset])
+ if ( (offset < fs) &&
+ ('\n' == data[offset]) )
state = PEER_INDEX;
- else if ('|' == data[offset])
+ else if ( (offset < fs) &&
+ ('|' == data[offset]) )
{
state = OTHER_PEER_INDEX;
offset++;
diff --git a/src/testing/testing.c b/src/testing/testing.c
index bab7976ea..ba7bf827e 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -907,6 +907,7 @@ update_config_sections (void *cls,
{
ikeys[key] = ptr;
ptr = strstr (ptr, ";");
+ GNUNET_assert (NULL != ptr); /* worked just before... */
*ptr = '\0';
ptr++;
}
diff --git a/src/transport/gnunet-transport-certificate-creation.c
b/src/transport/gnunet-transport-certificate-creation.c
index 129df7b35..edaf4773a 100644
--- a/src/transport/gnunet-transport-certificate-creation.c
+++ b/src/transport/gnunet-transport-certificate-creation.c
@@ -44,7 +44,7 @@ make_dev_zero (int fd,
GNUNET_assert (-1 != z);
if (z == fd)
return;
- dup2 (z, fd);
+ GNUNET_break (fd == dup2 (z, fd));
GNUNET_assert (0 == close (z));
}
#endif
diff --git a/src/transport/plugin_transport_udp.c
b/src/transport/plugin_transport_udp.c
index 76132523b..eb48341b7 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -1623,7 +1623,7 @@ enqueue (struct Plugin *plugin,
GNUNET_break (0);
return;
}
- if (plugin->bytes_in_buffer + udpw->msg_size > INT64_MAX)
+ if (plugin->bytes_in_buffer > INT64_MAX - udpw->msg_size)
{
GNUNET_break (0);
}
diff --git a/src/util/service_new.c b/src/util/service_new.c
index 22eec0bde..5b3a332ac 100644
--- a/src/util/service_new.c
+++ b/src/util/service_new.c
@@ -1733,6 +1733,7 @@ GNUNET_SERVICE_ruN_ (int argc,
GNUNET_GETOPT_OPTION_END
};
+ err = 1;
memset (&sh,
0,
sizeof (sh));
diff --git a/src/util/socks.c b/src/util/socks.c
index 37e60e3e4..8c32eff4f 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -372,15 +372,18 @@ transmit_ready (void *cls,
return 0;
}
- GNUNET_assert (1024 >= size && size > 0);
- GNUNET_assert (SOCKS5_step_done > ih->step && ih->step >= 0);
+ GNUNET_assert ( (1024 >= size) && (size > 0) );
+ GNUNET_assert ( (SOCKS5_step_done > ih->step) && (ih->step >= 0) );
unsigned char * b = ih->outstep[ih->step];
unsigned char * e = ih->outstep[ih->step+1];
GNUNET_assert (e <= &ih->outbuf[1024]);
- unsigned l = e - b;
- GNUNET_assert (size >= l && l >= 0);
- GNUNET_memcpy(buf, b, l);
- register_reciever (ih, register_reciever_wants(ih));
+ unsigned int l = e - b;
+ GNUNET_assert (size >= l);
+ GNUNET_memcpy (buf,
+ b,
+ l);
+ register_reciever (ih,
+ register_reciever_wants (ih));
return l;
}
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index aa0ea51a3..aab0a143f 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -2061,6 +2061,7 @@ route_packet (struct DestinationEntry *destination,
void *payload;
uint8_t new_type;
+ new_type = icmp->type;
/* Perform ICMP protocol-translation (depending on destination AF and
source AF)
and throw away ICMP payload depending on ICMP message type */
switch (af)
@@ -2111,8 +2112,8 @@ route_packet (struct DestinationEntry *destination,
switch (icmp->type)
{
case GNUNET_TUN_ICMPTYPE6_DESTINATION_UNREACHABLE:
- if (destination->details.exit_destination.af == AF_INET6)
- new_type = GNUNET_TUN_ICMPTYPE6_DESTINATION_UNREACHABLE;
+ if (destination->details.exit_destination.af == AF_INET)
+ new_type = GNUNET_TUN_ICMPTYPE_DESTINATION_UNREACHABLE;
/* throw away IP-payload, exit will have to make it up anyway */
payload_length = sizeof (struct GNUNET_TUN_IcmpHeader);
break;
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (1fee963ef -> 9fc7ff92a),
gnunet <=
- [GNUnet-SVN] [gnunet] 01/28: fix use of uninitialized (shadow-issue) expiration, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 08/28: fix memory leak, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 03/28: make sure 'err' is initialized on all error paths, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 06/28: properly handle error on empty queue, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 04/28: handle case 'diff' is NULL - fixes NPE, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 02/28: make compiler happy, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 05/28: fix comment, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 07/28: fix memory leak, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 10/28: fix memory leak, gnunet, 2017/03/10
- [GNUnet-SVN] [gnunet] 20/28: fix out-of-bounds case in parser, gnunet, 2017/03/10