2 files changed, 6 insertions, 1 deletions

diff --git a/src/util/disk.c b/src/util/disk.c
index ccd930907..6dca6db54 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1930,13 +1930,17 @@ GNUNET_DISK_get_handle_from_w32_handle (HANDLE osfh)
  * Get a handle from a native integer FD.
  *
  * @param fno native integer file descriptor
- * @return file handle corresponding to the descriptor
+ * @return file handle corresponding to the descriptor, NULL on error
  */
 struct GNUNET_DISK_FileHandle *
 GNUNET_DISK_get_handle_from_int_fd (int fno)
 {
   struct GNUNET_DISK_FileHandle *fh;
 
+  if ( (((off_t) -1) == lseek (fno, 0, SEEK_CUR)) &&
+       (EBADF == errno) )
+    return NULL; /* invalid FD */
+
 #ifndef WINDOWS
   fh = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
 
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index e0e1614f4..12dba6a6b 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -722,6 +722,7 @@ start_process (int pipe_control,
   }
   if (0 != ret)
   {
+    unsetenv (GNUNET_OS_CONTROL_PIPE);
     gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
     gnunet_proc->pid = ret;
     gnunet_proc->control_pipe = childpipe_write;