fix

2 files changed, 3 insertions, 1 deletions

diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 9b442bf30..2b1c5fe59 100644
--- 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 f55254b05..e60f99ed6 100644
--- 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;