From f5beb3eaf163fc0bf2a4f86bd413d3ee6939cfea Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 6 Jul 2016 11:14:11 +0000
Subject: [PATCH] -fix misc issues
---
src/arm/arm_api.c | 4 +--
src/ats-tests/ats-testing-log.c | 2 +-
src/ats-tests/gnunet-solver-eval.c | 32 +++++++++++++------
src/exit/gnunet-daemon-exit.c | 8 ++++-
src/gns/gnunet-gns-proxy.c | 4 +--
src/gns/gnunet-service-gns_interceptor.c | 2 ++
src/gns/gnunet-service-gns_resolver.c | 1 +
src/gnsrecord/gnsrecord_misc.c | 2 +-
src/include/gnunet_pq_lib.h | 3 --
src/namestore/plugin_namestore_sqlite.c | 2 +-
.../test_namestore_api_zone_iteration_stop.c | 25 +++++++--------
src/nse/perf_kdf.c | 2 +-
src/peerinfo/gnunet-service-peerinfo.c | 17 ++++++----
src/pq/pq.c | 9 ++----
src/regex/gnunet-regex-profiler.c | 32 +++++++++++++------
src/regex/regex_internal.c | 6 ++--
.../gnunet-service-scalarproduct-ecc_bob.c | 2 +-
src/util/bandwidth.c | 2 +-
src/util/disk.c | 10 +++++-
src/util/network.c | 6 ++++
src/util/test_server.c | 1 -
21 files changed, 108 insertions(+), 64 deletions(-)
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index ed36c61cd..19b192378 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -322,7 +322,7 @@ check_arm_list_result (void *cls,
{
const char *pos = (const char *) &lres[1];
uint16_t rcount = ntohs (lres->count);
- uint16_t msize = ntohs (lres->arm_msg.header.size);
+ uint16_t msize = ntohs (lres->arm_msg.header.size) - sizeof (*lres);
uint16_t size_check;
size_check = 0;
@@ -355,7 +355,7 @@ handle_arm_list_result (void *cls,
uint16_t rcount = ntohs (lres->count);
const char *list[rcount];
const char *pos = (const char *) &lres[1];
- uint16_t msize = ntohs (lres->arm_msg.header.size);
+ uint16_t msize = ntohs (lres->arm_msg.header.size) - sizeof (*lres);
struct GNUNET_ARM_Operation *op;
uint16_t size_check;
uint64_t id;
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c
index 2442a8249..61aca6b18 100644
--- a/src/ats-tests/ats-testing-log.c
+++ b/src/ats-tests/ats-testing-log.c
@@ -686,7 +686,7 @@ GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l)
}
else
{
- mlt->total_throughput_send = 0;
+ mlt->total_throughput_recv = 0;
//mlt->total_throughput_recv = prev_log_mlt->total_throughput_recv; /* no msgs received */
}
}
diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c
index 0d2460b7f..0e49a3a32 100644
--- a/src/ats-tests/gnunet-solver-eval.c
+++ b/src/ats-tests/gnunet-solver-eval.c
@@ -65,6 +65,7 @@ create_experiment ()
return e;
}
+
static void
free_experiment (struct Experiment *e)
{
@@ -92,9 +93,11 @@ free_experiment (struct Experiment *e)
GNUNET_free (e);
}
+
static int
-load_episode (struct Experiment *e, struct Episode *cur,
- struct GNUNET_CONFIGURATION_Handle *cfg)
+load_episode (struct Experiment *e,
+ struct Episode *cur,
+ struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_ATS_TEST_Operation *o;
char *sec_name;
@@ -186,8 +189,12 @@ load_episode (struct Experiment *e, struct Episode *cur,
}
if (o->dest_id > (e->num_slaves - 1))
{
- fprintf (stderr, "Invalid destination %llu in operation %u `%s' in episode %u\n",
- o->dest_id, op_counter, op, cur->id);
+ fprintf (stderr,
+ "Invalid destination %llu in operation %u `%s' in episode %u\n",
+ o->dest_id,
+ op_counter,
+ op,
+ cur->id);
GNUNET_free (op);
GNUNET_free (op_name);
GNUNET_free (sec_name);
@@ -197,9 +204,13 @@ load_episode (struct Experiment *e, struct Episode *cur,
GNUNET_free (op_name);
GNUNET_asprintf(&op_name, "op-%u-type", op_counter);
- if ( (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_string(cfg,
- sec_name, op_name, &type)) &&
- ((STOP_SEND != o->type) || (STOP_PREFERENCE != o->type)))
+ if ( (GNUNET_SYSERR !=
+ GNUNET_CONFIGURATION_get_value_string(cfg,
+ sec_name,
+ op_name,
+ &type)) &&
+ (STOP_SEND != o->type) &&
+ (STOP_PREFERENCE != o->type) )
{
/* Load arguments for set_rate, start_send, set_preference */
if (0 == strcmp (type, "constant"))
@@ -249,8 +260,11 @@ load_episode (struct Experiment *e, struct Episode *cur,
/* Get max rate */
GNUNET_asprintf(&op_name, "op-%u-max-rate", op_counter);
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
- sec_name, op_name, &o->max_rate))
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_get_value_number (cfg,
+ sec_name,
+ op_name,
+ &o->max_rate))
{
if ((GNUNET_ATS_TEST_TG_LINEAR == o->gen_type) ||
(GNUNET_ATS_TEST_TG_RANDOM == o->gen_type) ||
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 854d12006..7c67313e6 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -3671,13 +3671,17 @@ run (void *cls,
if (GNUNET_YES == ipv6_enabled)
{
+ ipv6addr = NULL;
if ( (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "exit", "IPV6ADDR",
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "exit",
+ "IPV6ADDR",
&ipv6addr) ||
(1 != inet_pton (AF_INET6, ipv6addr, &exit_ipv6addr))) )
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "EXIT", "IPV6ADDR");
GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free_non_null (ipv6addr);
return;
}
exit_argv[3] = ipv6addr;
@@ -3710,6 +3714,7 @@ run (void *cls,
}
if (GNUNET_YES == ipv4_enabled)
{
+ ipv4addr = NULL;
if ( (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_string (cfg, "exit", "IPV4ADDR",
&ipv4addr) ||
@@ -3717,6 +3722,7 @@ run (void *cls,
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "EXIT", "IPV4ADDR");
GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free_non_null (ipv4addr);
return;
}
exit_argv[5] = ipv4addr;
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 7ab8843bb..83935ff76 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -409,7 +409,7 @@ enum SocksPhase
SOCKS5_SOCKET_WITH_MHD,
/**
- * We've finished receiving upload data from MHD.
+ * We've started receiving upload data from MHD.
*/
SOCKS5_SOCKET_UPLOAD_STARTED,
@@ -1230,7 +1230,7 @@ curl_upload_cb (void *buf, size_t size, size_t nmemb, void *cls)
"Completed CURL UPLOAD\n");
return 0; /* upload finished, can now download */
}
- if ( (SOCKS5_SOCKET_UPLOAD_STARTED != s5r->state) ||
+ if ( (SOCKS5_SOCKET_UPLOAD_STARTED != s5r->state) &&
(SOCKS5_SOCKET_UPLOAD_DONE != s5r->state) )
{
GNUNET_break (0);
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index 4d57230a1..7a3cfc0dd 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -261,6 +261,8 @@ reply_to_dns (void *cls, uint32_t rd_count,
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Error converting GNS response to DNS response!\n"));
+ if (GNUNET_NO == ret)
+ GNUNET_free (buf);
}
else
{
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 2dec9a2af..ce6428a44 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -1323,6 +1323,7 @@ handle_gns2dns_result (void *cls,
/* expand authority chain */
ac = GNUNET_new (struct AuthorityChain);
ac->rh = rh;
+ GNUNET_assert (strlen (rh->g2dc->ns) <= GNUNET_DNSPARSER_MAX_NAME_LENGTH);
strcpy (ac->authority_info.dns_authority.name,
rh->g2dc->ns);
memcpy (&ac->authority_info.dns_authority.dns_ip,
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index 27d1e7b21..4c3bf6fa8 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -185,7 +185,7 @@ GNUNET_GNSRECORD_record_get_expiration_time (unsigned int rd_count,
/* We have a shadow record */
if (0 != (rd[c2].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
{
- rt_shadow.rel_value_us = rd[2].expiration_time;
+ rt_shadow.rel_value_us = rd[c2].expiration_time;
at_shadow = GNUNET_TIME_relative_to_absolute (rt_shadow);
}
else
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h
index 4e4139b43..33a3e5425 100644
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@ -442,15 +442,12 @@ GNUNET_PQ_exec_prepared (PGconn *db_conn,
/**
* Extract results from a query result according to the given specification.
- * If colums are NULL, the destination is not modified, and #GNUNET_NO
- * is returned.
*
* @param result result to process
* @param[in,out] rs result specification to extract for
* @param row row from the result to extract
* @return
* #GNUNET_YES if all results could be extracted
- * #GNUNET_NO if at least one result was NULL
* #GNUNET_SYSERR if a result was invalid (non-existing field)
*/
int
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index d6a2a2862..3710a4820 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -315,7 +315,7 @@ database_shutdown (struct Plugin *plugin)
sqlite3_finalize (plugin->iterate_all_zones);
if (NULL != plugin->zone_to_name)
sqlite3_finalize (plugin->zone_to_name);
- if (NULL != plugin->zone_to_name)
+ if (NULL != plugin->lookup_label)
sqlite3_finalize (plugin->lookup_label);
result = sqlite3_close (plugin->dbh);
if (result == SQLITE_BUSY)
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index 52645b5eb..36f527da0 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -365,27 +365,26 @@ empty_zone_proc (void *cls,
char *hostkey_file;
GNUNET_assert (nsh == cls);
- if (NULL != zone)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Expected empty zone but received zone private key\n"));
+ if (NULL != zone)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Expected empty zone but received zone private key\n"));
GNUNET_break (0);
if (endbadly_task != NULL)
- GNUNET_SCHEDULER_cancel (endbadly_task);
+ GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
return;
- }
- if ((NULL != label) || (NULL != rd) || (0 != rd))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Expected no zone content but received data\n"));
+ }
+ if ((NULL != label) || (NULL != rd) || (0 != rd_count))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Expected no zone content but received data\n"));
GNUNET_break (0);
if (endbadly_task != NULL)
- GNUNET_SCHEDULER_cancel (endbadly_task);
+ GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
return;
- }
-
+ }
zi = NULL;
GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
diff --git a/src/nse/perf_kdf.c b/src/nse/perf_kdf.c
index b62b5eba6..4981eae5d 100644
--- a/src/nse/perf_kdf.c
+++ b/src/nse/perf_kdf.c
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start),
GNUNET_YES));
GAUGER ("NSE", "Proof-of-work hashing",
- 1024 / (1 +
+ 1024LL / (1LL +
GNUNET_TIME_absolute_get_duration
(start).rel_value_us / 1000LL), "hashes/ms");
return 0;
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 66082e8f7..8be6cf5ab 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -338,12 +338,12 @@ read_host_file (const char *fn,
struct ReadHostFileContext *r)
{
char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN;
- unsigned int size_total;
+ ssize_t size_total;
struct GNUNET_TIME_Absolute now;
unsigned int left;
const struct GNUNET_HELLO_Message *hello;
struct GNUNET_HELLO_Message *hello_clean;
- unsigned read_pos;
+ size_t read_pos;
int size_hello;
r->friend_only_hello = NULL;
@@ -1005,6 +1005,7 @@ discard_hosts_helper (void *cls,
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
GNUNET_ERROR_TYPE_BULK,
"unlink", fn);
+ GNUNET_free (writebuffer);
return GNUNET_OK;
}
new_hello = GNUNET_HELLO_iterate_addresses (hello,
@@ -1028,11 +1029,13 @@ discard_hosts_helper (void *cls,
if (0 < write_pos)
{
- GNUNET_DISK_fn_write (fn, writebuffer,write_pos,
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE |
- GNUNET_DISK_PERM_GROUP_READ |
- GNUNET_DISK_PERM_OTHER_READ);
+ GNUNET_DISK_fn_write (fn,
+ writebuffer,
+ write_pos,
+ GNUNET_DISK_PERM_USER_READ |
+ GNUNET_DISK_PERM_USER_WRITE |
+ GNUNET_DISK_PERM_GROUP_READ |
+ GNUNET_DISK_PERM_OTHER_READ);
}
else if (0 != UNLINK (fn))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
diff --git a/src/pq/pq.c b/src/pq/pq.c
index 43186c41e..46463a190 100644
--- a/src/pq/pq.c
+++ b/src/pq/pq.c
@@ -119,15 +119,13 @@ GNUNET_PQ_cleanup_result (struct GNUNET_PQ_ResultSpec *rs)
/**
* Extract results from a query result according to the given
- * specification. If colums are NULL, the destination is not
- * modified, and #GNUNET_NO is returned.
+ * specification.
*
* @param result result to process
* @param[in,out] rs result specification to extract for
* @param row row from the result to extract
* @return
* #GNUNET_YES if all results could be extracted
- * #GNUNET_NO if at least one result was NULL
* #GNUNET_SYSERR if a result was invalid (non-existing field)
*/
int
@@ -136,7 +134,6 @@ GNUNET_PQ_extract_result (PGresult *result,
int row)
{
unsigned int i;
- int had_null = GNUNET_NO;
int ret;
for (i=0; NULL != rs[i].conv; i++)
@@ -150,7 +147,7 @@ GNUNET_PQ_extract_result (PGresult *result,
spec->fname,
&spec->dst_size,
spec->dst);
- if (GNUNET_SYSERR == ret)
+ if (GNUNET_OK != ret)
{
GNUNET_PQ_cleanup_result (rs);
return GNUNET_SYSERR;
@@ -158,8 +155,6 @@ GNUNET_PQ_extract_result (PGresult *result,
if (NULL != spec->result_size)
*spec->result_size = spec->dst_size;
}
- if (GNUNET_YES == had_null)
- return GNUNET_NO;
return GNUNET_OK;
}
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index 2114e2cb1..c5ecf3b4d 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -1231,41 +1231,55 @@ load_search_strings (const char *filename,
"Could not find search strings file %s\n", filename);
return GNUNET_SYSERR;
}
- if (GNUNET_OK != GNUNET_DISK_file_size (filename, &filesize, GNUNET_YES, GNUNET_YES))
+ if (GNUNET_OK !=
+ GNUNET_DISK_file_size (filename,
+ &filesize,
+ GNUNET_YES,
+ GNUNET_YES))
filesize = 0;
if (0 == filesize)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Search strings file %s is empty.\n", filename);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Search strings file %s is empty.\n",
+ filename);
return GNUNET_SYSERR;
}
- data = GNUNET_malloc (filesize);
- if (filesize != GNUNET_DISK_fn_read (filename, data, filesize))
+ data = GNUNET_malloc (filesize + 1);
+ if (filesize != GNUNET_DISK_fn_read (filename,
+ data,
+ filesize))
{
GNUNET_free (data);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Could not read search strings file %s.\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Could not read search strings file %s.\n",
filename);
return GNUNET_SYSERR;
}
buf = data;
offset = 0;
str_cnt = 0;
- while (offset < (filesize - 1) && str_cnt < limit)
+ while ( (offset < (filesize - 1)) && (str_cnt < limit) )
{
offset++;
- if (((data[offset] == '\n')) && (buf != &data[offset]))
+ if ( ((data[offset] == '\n')) &&
+ (buf != &data[offset]) )
{
data[offset] = '\0';
str_cnt++;
buf = &data[offset + 1];
}
- else if ((data[offset] == '\n') || (data[offset] == '\0'))
+ else if ( (data[offset] == '\n') ||
+ (data[offset] == '\0') )
buf = &data[offset + 1];
}
*strings = GNUNET_malloc (sizeof (char *) * str_cnt);
offset = 0;
for (i = 0; i < str_cnt; i++)
{
- GNUNET_asprintf (&(*strings)[i], "%s%s", regex_prefix, &data[offset]);
+ GNUNET_asprintf (&(*strings)[i],
+ "%s%s",
+ regex_prefix,
+ &data[offset]);
offset += strlen (&data[offset]) + 1;
}
GNUNET_free (data);
diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c
index 616b7f141..cb78545b9 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -2037,9 +2037,9 @@ dfa_merge_nondistinguishable_states (struct REGEX_INTERNAL_Context *ctx,
/* same edge, but targets definitively different, so we're different
as well */
if (t1->to_state->marked > t2->to_state->marked)
- idx1 = t1->to_state->marked * state_cnt + t2->to_state->marked;
+ idx1 = (unsigned long long) t1->to_state->marked * state_cnt + t2->to_state->marked;
else
- idx1 = t2->to_state->marked * state_cnt + t1->to_state->marked;
+ idx1 = (unsigned long long) t2->to_state->marked * state_cnt + t1->to_state->marked;
if (0 != (table[idx1 / 32] & (1 << (idx1 % 32))))
{
table[idx / 32] |= (1 << (idx % 32));
@@ -2066,7 +2066,7 @@ dfa_merge_nondistinguishable_states (struct REGEX_INTERNAL_Context *ctx,
for (s2 = a->states_head; NULL != s2 && s1 != s2; s2 = s2_next)
{
s2_next = s2->next;
- idx = s1->marked * state_cnt + s2->marked;
+ idx = (unsigned long long) s1->marked * state_cnt + s2->marked;
if (0 == (table[idx / 32] & (1 << (idx % 32))))
automaton_merge_states (ctx, a, s1, s2);
}
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
index 9d0bf57b1..a8dce9115 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
@@ -357,7 +357,7 @@ destroy_service_session (struct BobServiceSession *s)
gcry_mpi_point_release (s->prod_g_i_b_i);
s->prod_g_i_b_i = NULL;
}
- if (NULL != s->prod_g_i_b_i)
+ if (NULL != s->prod_h_i_b_i)
{
gcry_mpi_point_release (s->prod_h_i_b_i);
s->prod_h_i_b_i = NULL;
diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index 364c46977..bc5c02d60 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -177,7 +177,7 @@ update_excess (struct GNUNET_BANDWIDTH_Tracker *av)
500000LL) / 1000000LL;
current_consumption = av->consumption_since_last_update__ - delta_avail;
/* negative current_consumption means that we have savings */
- max_carry = av->available_bytes_per_s__ * av->max_carry_s__;
+ max_carry = (uint64_t) av->available_bytes_per_s__ * av->max_carry_s__;
if (max_carry < GNUNET_SERVER_MAX_MESSAGE_SIZE)
max_carry = GNUNET_SERVER_MAX_MESSAGE_SIZE;
left_bytes = max_carry + current_consumption;
diff --git a/src/util/disk.c b/src/util/disk.c
index 4624df7c1..d9ebde84f 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -527,14 +527,18 @@ char *
GNUNET_DISK_mkdtemp (const char *t)
{
char *fn;
+ mode_t omask;
+ omask = umask (S_IWGRP | S_IWOTH | SIRGRP | S_IROTH);
fn = mktemp_name (t);
if (fn != mkdtemp (fn))
{
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkdtemp", fn);
GNUNET_free (fn);
+ umask (omask);
return NULL;
}
+ umask (omask);
return fn;
}
@@ -587,14 +591,18 @@ GNUNET_DISK_mktemp (const char *t)
{
int fd;
char *fn;
+ mode_t omask;
+ omask = umask (S_IWGRP | S_IWOTH | SIRGRP | S_IROTH);
fn = mktemp_name (t);
if (-1 == (fd = mkstemp (fn)))
{
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn);
GNUNET_free (fn);
+ umask (omask);
return NULL;
}
+ umask (omask);
if (0 != CLOSE (fd))
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "close", fn);
return fn;
diff --git a/src/util/network.c b/src/util/network.c
index e42dfc4dc..ba213b412 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -166,6 +166,12 @@ GNUNET_NETWORK_unix_precheck (const struct sockaddr_un *un)
int ret;
s = socket (AF_UNIX, SOCK_STREAM, 0);
+ if (-1 == s)
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to open AF_UNIX socket");
+ return;
+ }
ret = connect (s,
(struct sockaddr *) un,
sizeof (struct sockaddr_un));
diff --git a/src/util/test_server.c b/src/util/test_server.c
index f82ecb2b1..384a1cef0 100644
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -239,7 +239,6 @@ task (void *cls)
GNUNET_MQ_handler_end ()
};
-
sap[0] = (struct sockaddr *) &sa;
slens[0] = sizeof (sa);
sap[1] = NULL;
--
2.25.1