[GNUnet-SVN] r34459 - gnunet/src/scalarproduct

[gnunet]

Author: grothoff
Date: 2014-11-30 20:49:02 +0100 (Sun, 30 Nov 2014)
New Revision: 34459

Modified:
   gnunet/src/scalarproduct/Makefile.am
   gnunet/src/scalarproduct/scalarproduct_api.c
Log:
-handle msg NULL

Modified: gnunet/src/scalarproduct/Makefile.am
===================================================================
--- gnunet/src/scalarproduct/Makefile.am        2014-11-30 19:29:54 UTC (rev 
34458)
+++ gnunet/src/scalarproduct/Makefile.am        2014-11-30 19:49:02 UTC (rev 
34459)
@@ -66,5 +66,5 @@
 
 if ENABLE_TEST_RUN
   AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export 
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
-#  TESTS = $(check_SCRIPTS)
+  TESTS = $(check_SCRIPTS)
 endif

Modified: gnunet/src/scalarproduct/scalarproduct_api.c
===================================================================
--- gnunet/src/scalarproduct/scalarproduct_api.c        2014-11-30 19:29:54 UTC 
(rev 34458)
+++ gnunet/src/scalarproduct/scalarproduct_api.c        2014-11-30 19:49:02 UTC 
(rev 34459)
@@ -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 @@
   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 @@
       }
     }
   }
-  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);