[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37603 - in gnunet/src: multicast psyc psycstore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37603 - in gnunet/src: multicast psyc psycstore |
Date: |
Fri, 29 Jul 2016 01:36:39 +0200 |
Author: lynx
Date: 2016-07-29 01:36:38 +0200 (Fri, 29 Jul 2016)
New Revision: 37603
Modified:
gnunet/src/multicast/multicast_api.c
gnunet/src/psyc/gnunet-service-psyc.c
gnunet/src/psyc/test_psyc.c
gnunet/src/psycstore/test_psycstore.c
Log:
fixed use after free and several printf warnings
Modified: gnunet/src/multicast/multicast_api.c
===================================================================
--- gnunet/src/multicast/multicast_api.c 2016-07-28 15:15:52 UTC (rev
37602)
+++ gnunet/src/multicast/multicast_api.c 2016-07-28 23:36:38 UTC (rev
37603)
@@ -1124,7 +1124,8 @@
uint64_t flags)
{
member_replay_request (mem, fragment_id, 0, 0, flags);
- // FIXME: return
+ // FIXME: return something useful
+ return NULL;
}
@@ -1153,7 +1154,8 @@
uint64_t flags)
{
member_replay_request (mem, 0, message_id, fragment_offset, flags);
- // FIXME: return
+ // FIXME: return something useful
+ return NULL;
}
Modified: gnunet/src/psyc/gnunet-service-psyc.c
===================================================================
--- gnunet/src/psyc/gnunet-service-psyc.c 2016-07-28 15:15:52 UTC (rev
37602)
+++ gnunet/src/psyc/gnunet-service-psyc.c 2016-07-28 23:36:38 UTC (rev
37603)
@@ -856,12 +856,12 @@
case GNUNET_NO:
GNUNET_MULTICAST_replay_response (rh, NULL,
GNUNET_MULTICAST_REC_NOT_FOUND);
- break;
+ return;
case GNUNET_PSYCSTORE_MEMBERSHIP_TEST_FAILED:
GNUNET_MULTICAST_replay_response (rh, NULL,
GNUNET_MULTICAST_REC_ACCESS_DENIED);
- break;
+ return;
case GNUNET_SYSERR:
GNUNET_MULTICAST_replay_response (rh, NULL,
@@ -868,6 +868,11 @@
GNUNET_MULTICAST_REC_INTERNAL_ERROR);
return;
}
+ /* GNUNET_MULTICAST_replay_response frees 'rh' when passed
+ * an error code, so it must be ensured no further processing
+ * is attempted on 'rh'. Maybe this should be refactored as
+ * it doesn't look very intuitive. --lynX
+ */
GNUNET_MULTICAST_replay_response_end (rh);
}
@@ -2269,6 +2274,9 @@
uint16_t size = ntohs (msg->size);
if (GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD < size - sizeof (*msg))
{
+ /* Coverity says this printf has incompatible args
+ * but I don't see anything wrong with it.. FIXME
+ */
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"%p Message payload too large: %u < %u.\n",
chn,
Modified: gnunet/src/psyc/test_psyc.c
===================================================================
--- gnunet/src/psyc/test_psyc.c 2016-07-28 15:15:52 UTC (rev 37602)
+++ gnunet/src/psyc/test_psyc.c 2016-07-28 23:36:38 UTC (rev 37603)
@@ -350,7 +350,7 @@
const void *err_msg, uint16_t err_msg_size)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "slave_state_get_prefix:\t%" PRId64 " (%.s)\n",
+ "slave_state_get_prefix:\t%" PRId64 " (%.*s)\n",
result,
(int) err_msg_size,
(const char *) err_msg);
@@ -376,7 +376,7 @@
const void *err_msg, uint16_t err_msg_size)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "master_state_get_prefix:\t%" PRId64 " (%s)\n", result, err_msg);
+ "master_state_get_prefix:\t%" PRId64 " (%s)\n", result, (char *)
err_msg);
// FIXME: GNUNET_assert (2 == result);
slave_state_get_prefix ();
}
@@ -400,7 +400,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"slave_state_get:\t%" PRId64 " (%.*s)\n",
- result, err_msg_size, err_msg);
+ result, err_msg_size, (char *) err_msg);
// FIXME: GNUNET_assert (2 == result);
master_state_get_prefix ();
}
@@ -424,7 +424,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"master_state_get:\t%" PRId64 " (%.*s)\n",
- result, err_msg_size, err_msg);
+ result, err_msg_size, (char *) err_msg);
// FIXME: GNUNET_assert (1 == result);
slave_state_get ();
}
@@ -538,7 +538,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"master_history_replay_latest:\t%" PRId64 " (%.*s)\n",
- result, err_msg_size, err_msg);
+ result, err_msg_size, (char *) err_msg);
GNUNET_assert (9 == result);
slave_history_replay_latest ();
@@ -619,7 +619,7 @@
{
struct TransmitClosure *tmit = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Test #%d: Transmit notify modifier: %lu bytes available, "
+ "Test #%d: Transmit notify modifier: %u bytes available, "
"%u modifiers left to process.\n",
test, *data_size, GNUNET_PSYC_env_get_count (tmit->env));
@@ -723,7 +723,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"slave_remove:\t%" PRId64 " (%.*s)\n",
- result, err_msg_size, err_msg);
+ result, err_msg_size, (char *) err_msg);
slave_transmit ();
}
@@ -745,7 +745,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"slave_add:\t%" PRId64 " (%.*s)\n",
- result, err_msg_size, err_msg);
+ result, err_msg_size, (char *) err_msg);
slave_remove ();
}
@@ -837,7 +837,7 @@
slave_join (int t)
{
test = t;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test #%d: Joining slave.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test #%d: Joining slave.\n", t);
struct GNUNET_PeerIdentity origin = this_peer;
struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create ();
Modified: gnunet/src/psycstore/test_psycstore.c
===================================================================
--- gnunet/src/psycstore/test_psycstore.c 2016-07-28 15:15:52 UTC (rev
37602)
+++ gnunet/src/psycstore/test_psycstore.c 2016-07-28 23:36:38 UTC (rev
37603)
@@ -195,7 +195,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
" variable %s differs\nReceived: %.*s\nExpected: %.*s\n",
- name, value_size, value, val_size, val);
+ name, value_size, (char*) value, val_size, (char*) val);
GNUNET_assert (0);
return GNUNET_SYSERR;
}
@@ -208,7 +208,7 @@
{
struct StateClosure *scls = cls;
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_get_prefix_result:\t%d\n",
result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_get_prefix_result:\t%ld\n",
(long int) result);
GNUNET_assert (GNUNET_OK == result && 2 == scls->n);
op = GNUNET_PSYCSTORE_state_reset (h, &channel_pub_key,
@@ -221,7 +221,7 @@
const char *err_msg, uint16_t err_msg_size)
{
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_get_result:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_get_result:\t%ld\n", (long
int) result);
GNUNET_assert (GNUNET_OK == result);
scls.n = 0;
@@ -274,7 +274,7 @@
const char *err_msg, uint16_t err_msg_size)
{
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_modify_result:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_modify_result:\t%ld\n", (long
int) result);
GNUNET_assert (GNUNET_OK == result);
op = GNUNET_PSYCSTORE_counters_get (h, &channel_pub_key,
@@ -288,7 +288,7 @@
{
struct FragmentClosure *fcls = cls;
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_sync_result:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_sync_result:\t%ld\n", (long
int) result);
GNUNET_assert (GNUNET_OK == result);
op = GNUNET_PSYCSTORE_state_modify (h, &channel_pub_key,
@@ -332,7 +332,7 @@
{
struct FragmentClosure *fcls = cls;
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get_latest:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get_latest:\t%ld\n", (long
int) result);
GNUNET_assert (0 < result && fcls->n == fcls->n_expected);
modifiers[0] = (struct GNUNET_PSYC_Modifier) {
@@ -361,7 +361,7 @@
{
struct FragmentClosure *fcls = cls;
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get:\t%ld\n", (long int)
result);
GNUNET_assert (0 < result && fcls->n == fcls->n_expected);
fcls->n = 0;
@@ -378,7 +378,7 @@
{
struct FragmentClosure *fcls = cls;
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get_fragment:\t%d\n",
result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get_fragment:\t%ld\n", (long
int) result);
GNUNET_assert (0 < result && fcls->n == fcls->n_expected);
fcls->n = 0;
@@ -397,7 +397,7 @@
{
struct FragmentClosure *fcls = cls;
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "fragment_get_latest:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "fragment_get_latest:\t%ld\n", (long
int) result);
GNUNET_assert (0 < result && fcls->n == fcls->n_expected);
fcls->n = 1;
@@ -435,7 +435,7 @@
const char *err_msg, uint16_t err_msg_size)
{
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "fragment_store:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "fragment_store:\t%ld\n", (long int)
result);
GNUNET_assert (GNUNET_OK == result);
if ((intptr_t) cls == GNUNET_YES)
@@ -507,7 +507,7 @@
const char *err_msg, uint16_t err_msg_size)
{
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "membership_test:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "membership_test:\t%ld\n", (long int)
result);
GNUNET_assert (GNUNET_OK == result);
fragment_store ();
@@ -519,7 +519,7 @@
const char *err_msg, uint16_t err_msg_size)
{
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "membership_store:\t%d\n", result);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "membership_store:\t%ld\n", (long
int) result);
GNUNET_assert (GNUNET_OK == result);
op = GNUNET_PSYCSTORE_membership_test (h, &channel_pub_key, &slave_pub_key,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37603 - in gnunet/src: multicast psyc psycstore,
gnunet <=