[GNUnet-SVN] r24705 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-11-05 10:39:22 +0100 (Mon, 05 Nov 2012)
New Revision: 24705

Modified:
   gnunet/src/transport/plugin_transport_http_server.c
Log:
coverity bugs 10360 && 10361

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2012-11-05 09:38:08 UTC 
(rev 24704)
+++ gnunet/src/transport/plugin_transport_http_server.c 2012-11-05 09:39:22 UTC 
(rev 24705)
@@ -540,8 +540,7 @@
       return GNUNET_SYSERR;
   }
 
-
-  if (GNUNET_YES == session->server_send->disconnect)
+  if ((NULL != session->server_send) && (GNUNET_YES == 
session->server_send->disconnect))
     return GNUNET_SYSERR;
 
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, session->plugin->name,
@@ -567,10 +566,9 @@
                             stat_txt, msgbuf_size, GNUNET_NO);
   GNUNET_free (stat_txt);
 
-  server_reschedule (session->plugin, session->server_send->mhd_daemon, 
GNUNET_YES);
+  server_reschedule (session->plugin, session->server_send->mhd_daemon,
+      (NULL != session->server_send) ? GNUNET_YES : GNUNET_NO);
   server_reschedule_session_timeout (session);
-
-  /*  struct Plugin *plugin = cls; */
   return bytes_sent;
 }
 
@@ -1127,7 +1125,7 @@
   if (direction == _RECEIVE)
     s->server_recv = sc;
 
-  if ((NULL != s->server_send) && (NULL != s->server_send))
+  if ((NULL != s->server_send) && (NULL != s->server_recv))
     s->connect_in_progress = GNUNET_NO; /* PUT and GET are connected */
 
 #if MHD_VERSION >= 0x00090E00