From cf45705470db25831f48452380021d1429973139 Mon Sep 17 00:00:00 2001 From: Gabor X Toth <*@tg-x.net> Date: Mon, 16 Sep 2013 12:21:10 +0000 Subject: psycstore: fixing issues reported by static code analysis --- src/identity/gnunet-service-identity.c | 3 ++- src/psycstore/gnunet-service-psycstore.c | 4 +++- src/psycstore/test_psycstore.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c index f55e65019..52d072967 100644 --- a/src/identity/gnunet-service-identity.c +++ b/src/identity/gnunet-service-identity.c @@ -189,7 +189,8 @@ send_result_code (struct GNUNET_SERVER_Client *client, rcm->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_RESULT_CODE); rcm->header.size = htons (sizeof (struct GNUNET_IDENTITY_ResultCodeMessage) + elen); rcm->result_code = htonl (result_code); - memcpy (&rcm[1], emsg, elen); + if (0 < elen) + memcpy (&rcm[1], emsg, elen); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending result %d (%s) to client\n", (int) result_code, diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c index 3d6cfdc40..8a21167e1 100644 --- a/src/psycstore/gnunet-service-psycstore.c +++ b/src/psycstore/gnunet-service-psycstore.c @@ -113,7 +113,8 @@ send_result_code (struct GNUNET_SERVER_Client *client, uint32_t result_code, res->header.size = htons (sizeof (struct OperationResult) + err_len); res->result_code = htonl (result_code); res->op_id = op_id; - memcpy (&res[1], err_msg, err_len); + if (0 < err_len) + memcpy (&res[1], err_msg, err_len); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending result %d (%s) to client\n", (int) result_code, @@ -607,6 +608,7 @@ handle_state_get (void *cls, ret = db->state_get (db->cls, &req->channel_key, n, &send_state_var, &sc); } + GNUNET_free (n); } } switch (ret) diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c index 2daf8d101..5f927a6d5 100644 --- a/src/psycstore/test_psycstore.c +++ b/src/psycstore/test_psycstore.c @@ -454,7 +454,8 @@ membership_test_result (void *cls, int64_t result, const char *err_msg) - sizeof (msg->hop_counter) - sizeof (msg->signature)); msg->purpose.purpose = htonl (234); - GNUNET_CRYPTO_ecc_sign (slave_key, &msg->purpose, &msg->signature); + ASSERT (GNUNET_OK == GNUNET_CRYPTO_ecc_sign (slave_key, &msg->purpose, + &msg->signature)); op = GNUNET_PSYCSTORE_fragment_store (h, &channel_pub_key, msg, fcls.flags[0], &fragment_store_result, GNUNET_NO); -- cgit v1.2.3