diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-01 09:13:19 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-01 09:13:19 +0000 |
commit | 1410eed84796598e79e5868f9754a02018099885 (patch) | |
tree | 2b3b4701f719d87a314b18821dcbf2c2fa5861de /src | |
parent | a00e615c41331b3366781a62a1db864abb9c6105 (diff) | |
download | gnunet-1410eed84796598e79e5868f9754a02018099885.tar.gz gnunet-1410eed84796598e79e5868f9754a02018099885.zip |
- fixed 2128: Blacklisting makes transport service crash
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-service-transport_blacklist.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/transport/gnunet-service-transport_blacklist.c b/src/transport/gnunet-service-transport_blacklist.c index 6bd1caa50..fc7a5cec3 100644 --- a/src/transport/gnunet-service-transport_blacklist.c +++ b/src/transport/gnunet-service-transport_blacklist.c | |||
@@ -722,9 +722,11 @@ test_blacklisted (void *cls, const GNUNET_HashCode * key, void *value) | |||
722 | const char *transport_name = cls; | 722 | const char *transport_name = cls; |
723 | char *be = value; | 723 | char *be = value; |
724 | 724 | ||
725 | GNUNET_assert (transport_name != NULL); | 725 | /* blacklist check for specific no specific transport*/ |
726 | GNUNET_assert (be != NULL); | 726 | if (transport_name == NULL) |
727 | return GNUNET_NO; | ||
727 | 728 | ||
729 | /* blacklist check for specific transport */ | ||
728 | if (0 == strcmp (transport_name, be)) | 730 | if (0 == strcmp (transport_name, be)) |
729 | return GNUNET_NO; /* abort iteration! */ | 731 | return GNUNET_NO; /* abort iteration! */ |
730 | return GNUNET_OK; | 732 | return GNUNET_OK; |
@@ -748,6 +750,8 @@ GST_blacklist_test_allowed (const struct GNUNET_PeerIdentity *peer, | |||
748 | { | 750 | { |
749 | struct GST_BlacklistCheck *bc; | 751 | struct GST_BlacklistCheck *bc; |
750 | 752 | ||
753 | GNUNET_assert (peer != NULL); | ||
754 | |||
751 | if ((blacklist != NULL) && | 755 | if ((blacklist != NULL) && |
752 | (GNUNET_SYSERR == | 756 | (GNUNET_SYSERR == |
753 | GNUNET_CONTAINER_multihashmap_get_multiple (blacklist, &peer->hashPubKey, | 757 | GNUNET_CONTAINER_multihashmap_get_multiple (blacklist, &peer->hashPubKey, |