[GNUnet-SVN] r8490 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2009-06-05 11:28:13 -0600 (Fri, 05 Jun 2009)
New Revision: 8490

Modified:
   gnunet/src/util/client.c
   gnunet/src/util/test_network_transmit_cancel.c
Log:
fixes

Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c    2009-06-05 16:40:18 UTC (rev 8489)
+++ gnunet/src/util/client.c    2009-06-05 17:28:13 UTC (rev 8490)
@@ -287,16 +287,22 @@
   cmsg = (const struct GNUNET_MessageHeader *) sock->received_buf;
   msize = ntohs (cmsg->size);
   GNUNET_assert (sock->received_pos >= msize);
-  msg = GNUNET_malloc (msize);
-  memcpy (msg, cmsg, msize);
-  memmove (sock->received_buf,
-           &sock->received_buf[msize], sock->received_pos - msize);
+  if (handler != NULL)
+    {
+      msg = GNUNET_malloc (msize);
+      memcpy (msg, cmsg, msize);
+      memmove (sock->received_buf,
+              &sock->received_buf[msize], sock->received_pos - msize);
+    }
   sock->received_pos -= msize;
   sock->msg_complete = GNUNET_NO;
   sock->receiver_handler = NULL;
   check_complete (sock);
-  handler (cls, msg);
-  GNUNET_free (msg);
+  if (handler != NULL)
+    {
+      handler (cls, msg);
+      GNUNET_free (msg);
+    }
 }
 
 

Modified: gnunet/src/util/test_network_transmit_cancel.c
===================================================================
--- gnunet/src/util/test_network_transmit_cancel.c      2009-06-05 16:40:18 UTC 
(rev 8489)
+++ gnunet/src/util/test_network_transmit_cancel.c      2009-06-05 17:28:13 UTC 
(rev 8490)
@@ -27,7 +27,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define PORT 12435