From 3319bc1e3f55d09b648ad8f44fdb48ec400048d0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 5 Dec 2013 21:31:11 +0000 Subject: -check return values of hashmap operations --- src/ats/gnunet-service-ats_normalization.c | 7 ++++--- src/ats/gnunet-service-ats_reservations.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/ats') diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c index 70558a5a6..67fd32066 100644 --- a/src/ats/gnunet-service-ats_normalization.c +++ b/src/ats/gnunet-service-ats_normalization.c @@ -476,12 +476,13 @@ GAS_normalization_normalize_preference (void *src, if (NULL == GNUNET_CONTAINER_multipeermap_get (preference_peers, peer)) { - r_cur = GNUNET_malloc (sizeof (struct PeerRelative)); + r_cur = GNUNET_new (struct PeerRelative); r_cur->id = (*peer); for (i = 0; i < GNUNET_ATS_PreferenceCount; i++) r_cur->f_rel[i] = DEFAULT_REL_PREFERENCE; - GNUNET_CONTAINER_multipeermap_put (preference_peers, &r_cur->id, r_cur, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_put (preference_peers, &r_cur->id, r_cur, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); } if (GNUNET_SCHEDULER_NO_TASK == aging_task) diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c index bf5e62cae..c489ba723 100644 --- a/src/ats/gnunet-service-ats_reservations.c +++ b/src/ats/gnunet-service-ats_reservations.c @@ -107,11 +107,12 @@ GAS_reservations_set_bandwidth (const struct GNUNET_PeerIdentity *peer, } if (NULL == tracker) { - tracker = GNUNET_malloc (sizeof (struct GNUNET_BANDWIDTH_Tracker)); + tracker = GNUNET_new (struct GNUNET_BANDWIDTH_Tracker); GNUNET_BANDWIDTH_tracker_init (tracker, bandwidth_in, MAX_BANDWIDTH_CARRY_S); - GNUNET_CONTAINER_multipeermap_put (trackers, peer, tracker, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_put (trackers, peer, tracker, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); return; } GNUNET_BANDWIDTH_tracker_update_quota (tracker, bandwidth_in); -- cgit v1.2.3