-handle msg NULL

2 files changed, 8 insertions, 5 deletions

diff --git a/src/scalarproduct/Makefile.am b/src/scalarproduct/Makefile.am
index 071720812..0d3597126 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/scalarproduct/Makefile.am
@@ -66,5 +66,5 @@ check_SCRIPTS = \
 
 if ENABLE_TEST_RUN
   AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
-#  TESTS = $(check_SCRIPTS)
+  TESTS = $(check_SCRIPTS)
 endif
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index 747dd6872..26c69dd13 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -17,7 +17,6 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
  */
-
 /**
  * @file scalarproduct/scalarproduct_api.c
  * @brief API for the scalarproduct
@@ -156,8 +155,10 @@ process_result_message (struct GNUNET_SCALARPRODUCT_ComputationHandle *h,
   gcry_mpi_t num;
   size_t rsize;
 
-  if (ntohs (msg->header.size) - sizeof (struct ClientResponseMessage)
-      != product_len)
+  if ( (GNUNET_SCALARPRODUCT_Status_Success == status) &&
+       ( (NULL == msg) ||
+         ( (ntohs (msg->header.size) - sizeof (struct ClientResponseMessage)
+            != product_len) ) ) )
   {
     GNUNET_break (0);
     status = GNUNET_SCALARPRODUCT_Status_InvalidResponse;
@@ -191,7 +192,9 @@ process_result_message (struct GNUNET_SCALARPRODUCT_ComputationHandle *h,
       }
     }
   }
-  h->cont_datum (h->cont_cls, status, result);
+  h->cont_datum (h->cont_cls,
+                 status,
+                 result);
   if (NULL != result)
     gcry_mpi_release (result);
   GNUNET_SCALARPRODUCT_cancel (h);