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

[gnunet]

Author: grothoff
Date: 2011-12-09 09:15:06 +0100 (Fri, 09 Dec 2011)
New Revision: 18523

Modified:
   gnunet/src/util/os_priority.c
Log:
-LRN: Fix for ARMed processes that have zero lsocks (such as hostlist)




Modified: gnunet/src/util/os_priority.c
===================================================================
--- gnunet/src/util/os_priority.c       2011-12-08 21:55:58 UTC (rev 18522)
+++ gnunet/src/util/os_priority.c       2011-12-09 08:15:06 UTC (rev 18523)
@@ -1108,7 +1108,7 @@
     GNUNET_free (path);
     return NULL;
   }
-  if (lsocks != NULL)
+  if (lsocks != NULL && lsocks[0] != INVALID_SOCKET)
   {
     lsocks_pipe = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO);
 
@@ -1136,7 +1136,7 @@
   GNUNET_asprintf (&our_env[0], "%s=", GNUNET_OS_CONTROL_PIPE);
   GNUNET_asprintf (&our_env[1], "%s", childpipename);
   GNUNET_free (childpipename);
-  if (lsocks == NULL)
+  if (lsocks == NULL || lsocks[0] == INVALID_SOCKET)
     our_env[2] = NULL;
   else
   {
@@ -1178,7 +1178,7 @@
   CloseHandle (proc.hThread);
   GNUNET_free (cmd);
 
-  if (lsocks == NULL)
+  if (lsocks == NULL || lsocks[0] == INVALID_SOCKET)
     return gnunet_proc;
 
   GNUNET_DISK_pipe_close_end (lsocks_pipe, GNUNET_DISK_PIPE_END_READ);