-fix some of the obvious issues

1 files changed, 5 insertions, 3 deletions

diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
index 1cfc2a89f..b5ab8a88f 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -817,8 +817,8 @@ static int
 element_cmp (const void *a,
              const void *b)
 {
-  const struct MpiElement *ma = *(const struct MpiElement **) a;
-  const struct MpiElement *mb = *(const struct MpiElement **) b;
+  const struct MpiElement *ma = a;
+  const struct MpiElement *mb = b;
 
   return GNUNET_CRYPTO_hash_cmp (ma->key,
                                  mb->key);
@@ -858,7 +858,7 @@ send_alices_cryptodata_message (struct AliceServiceSession *s)
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Finished intersection, %d items remain\n",
        s->used_element_count);
-  qsort (s->intersected_elements,
+  qsort (s->sorted_elements,
          s->used_element_count,
          sizeof (struct MpiElement),
          &element_cmp);
@@ -1296,6 +1296,8 @@ handle_client_disconnect (void *cls,
 {
   struct AliceServiceSession *s;
 
+  if (NULL == client)
+    return;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Client %p disconnected from us.\n",
               client);