fix

diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 9b442bf30ec3b97995cc3414f3934fcd6531b0a4..2b1c5fe5977a9373c809ac599df037a7d43cdc4d 100644 (file)
--- a/src/core/gnunet-service-core_clients.c
+++ b/src/core/gnunet-service-core_clients.c
@@ -444,7 +444,7 @@ static void
 client_tokenizer_callback (void *cls, void *client,
                           const struct GNUNET_MessageHeader *message)
 {
-  struct TokenizerContext *tc = cls;
+  struct TokenizerContext *tc = client;
   struct GSC_ClientActiveRequest *car = tc->car;
 
   if (0 ==

diff --git a/src/core/gnunet-service-core_typemap.c b/src/core/gnunet-service-core_typemap.c
index f55254b055c83346792eaf82fe0acfc7847d5468..e60f99ed61e0f7545c4f6919ecef99efa44f32ba 100644 (file)
--- a/src/core/gnunet-service-core_typemap.c
+++ b/src/core/gnunet-service-core_typemap.c
@@ -213,6 +213,8 @@ GSC_TYPEMAP_test_match (const struct GSC_TypeMap *tmap,
 {  
   unsigned int i;
 
+  if (NULL == tmap)
+    return GNUNET_NO;
   for (i=0;i<tcnt;i++) 
     if (0 != (tmap->bits[types[i] / 32] & (1 << (types[i] % 32))))
       return GNUNET_YES;