GUnix{Input,Output}Stream: Only release cancelable poll-fd if we allocated it

Otherwise we get criticals a'la

 GLib-GIO-CRITICAL **: g_cancellable_release_fd: assertion `cancellable->priv->fd_refcount > 0' failed

when reading/writing to certain kinds of file descriptors.

Patch reviewed by Dan Winship on IRC.

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index 3d5f938..65a0dbd 100644 (file)
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.c
@@ -417,7 +417,8 @@ g_unix_input_stream_read (GInputStream  *stream,
       break;
     }
 
-  g_cancellable_release_fd (cancellable);
+  if (nfds == 2)
+    g_cancellable_release_fd (cancellable);
   return res;
 }
 

diff --git a/gio/gunixoutputstream.c b/gio/gunixoutputstream.c
index 01c3259..86f5277 100644 (file)
--- a/gio/gunixoutputstream.c
+++ b/gio/gunixoutputstream.c
@@ -403,7 +403,8 @@ g_unix_output_stream_write (GOutputStream  *stream,
       break;
     }
 
-  g_cancellable_release_fd (cancellable);
+  if (nfds == 2)
+    g_cancellable_release_fd (cancellable);
   return res;
 }