Fix double close of file descriptor on error. (#82139, Wayne Schuller)

Mon May 20 15:35:59 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/gfileutils.c (get_contents_regfile): Fix double
        close of file descriptor on error. (#82139, Wayne Schuller)

        * glib/gspawn.c (close_and_invalidate): Don't close
        fd's that have already been closed. (Fix from Michael
        Meeks, #81959)

        * glib/giochannel.c (g_io_channel_close): If not flushing,
        dump the contents of the write buffers, so we won't try
        to write them to an invalid fd later. (Patch from Ron Steinke,
        fixing #78290, Andreas Persenius.)

diff --git a/ChangeLog b/ChangeLog
index 311a2c73b74d2e3d391aa9cf36046b7753e49477..9154a4e0d9df4fbb09062b383d98710ec384eff2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Mon May 20 15:35:59 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * glib/gfileutils.c (get_contents_regfile): Fix double
+       close of file descriptor on error. (#82139, Wayne Schuller)
+ 
+       * glib/gspawn.c (close_and_invalidate): Don't close
+       fd's that have already been closed. (Fix from Michael
+       Meeks, #81959)
+ 
+       * glib/giochannel.c (g_io_channel_close): If not flushing,
+       dump the contents of the write buffers, so we won't try
+       to write them to an invalid fd later. (Patch from Ron Steinke,
+       fixing #78290, Andreas Persenius.)
+ 
 2002-05-18  Matthias Clasen  <maclas@gmx.de>
 
        * tests/markups/fail-36.gmarkup: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 311a2c73b74d2e3d391aa9cf36046b7753e49477..9154a4e0d9df4fbb09062b383d98710ec384eff2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Mon May 20 15:35:59 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * glib/gfileutils.c (get_contents_regfile): Fix double
+       close of file descriptor on error. (#82139, Wayne Schuller)
+ 
+       * glib/gspawn.c (close_and_invalidate): Don't close
+       fd's that have already been closed. (Fix from Michael
+       Meeks, #81959)
+ 
+       * glib/giochannel.c (g_io_channel_close): If not flushing,
+       dump the contents of the write buffers, so we won't try
+       to write them to an invalid fd later. (Patch from Ron Steinke,
+       fixing #78290, Andreas Persenius.)
+ 
 2002-05-18  Matthias Clasen  <maclas@gmx.de>
 
        * tests/markups/fail-36.gmarkup: 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 311a2c73b74d2e3d391aa9cf36046b7753e49477..9154a4e0d9df4fbb09062b383d98710ec384eff2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,17 @@
+Mon May 20 15:35:59 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * glib/gfileutils.c (get_contents_regfile): Fix double
+       close of file descriptor on error. (#82139, Wayne Schuller)
+ 
+       * glib/gspawn.c (close_and_invalidate): Don't close
+       fd's that have already been closed. (Fix from Michael
+       Meeks, #81959)
+ 
+       * glib/giochannel.c (g_io_channel_close): If not flushing,
+       dump the contents of the write buffers, so we won't try
+       to write them to an invalid fd later. (Patch from Ron Steinke,
+       fixing #78290, Andreas Persenius.)
+ 
 2002-05-18  Matthias Clasen  <maclas@gmx.de>
 
        * tests/markups/fail-36.gmarkup: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 311a2c73b74d2e3d391aa9cf36046b7753e49477..9154a4e0d9df4fbb09062b383d98710ec384eff2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+Mon May 20 15:35:59 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * glib/gfileutils.c (get_contents_regfile): Fix double
+       close of file descriptor on error. (#82139, Wayne Schuller)
+ 
+       * glib/gspawn.c (close_and_invalidate): Don't close
+       fd's that have already been closed. (Fix from Michael
+       Meeks, #81959)
+ 
+       * glib/giochannel.c (g_io_channel_close): If not flushing,
+       dump the contents of the write buffers, so we won't try
+       to write them to an invalid fd later. (Patch from Ron Steinke,
+       fixing #78290, Andreas Persenius.)
+ 
 2002-05-18  Matthias Clasen  <maclas@gmx.de>
 
        * tests/markups/fail-36.gmarkup: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 311a2c73b74d2e3d391aa9cf36046b7753e49477..9154a4e0d9df4fbb09062b383d98710ec384eff2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+Mon May 20 15:35:59 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * glib/gfileutils.c (get_contents_regfile): Fix double
+       close of file descriptor on error. (#82139, Wayne Schuller)
+ 
+       * glib/gspawn.c (close_and_invalidate): Don't close
+       fd's that have already been closed. (Fix from Michael
+       Meeks, #81959)
+ 
+       * glib/giochannel.c (g_io_channel_close): If not flushing,
+       dump the contents of the write buffers, so we won't try
+       to write them to an invalid fd later. (Patch from Ron Steinke,
+       fixing #78290, Andreas Persenius.)
+ 
 2002-05-18  Matthias Clasen  <maclas@gmx.de>
 
        * tests/markups/fail-36.gmarkup: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 311a2c73b74d2e3d391aa9cf36046b7753e49477..9154a4e0d9df4fbb09062b383d98710ec384eff2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+Mon May 20 15:35:59 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * glib/gfileutils.c (get_contents_regfile): Fix double
+       close of file descriptor on error. (#82139, Wayne Schuller)
+ 
+       * glib/gspawn.c (close_and_invalidate): Don't close
+       fd's that have already been closed. (Fix from Michael
+       Meeks, #81959)
+ 
+       * glib/giochannel.c (g_io_channel_close): If not flushing,
+       dump the contents of the write buffers, so we won't try
+       to write them to an invalid fd later. (Patch from Ron Steinke,
+       fixing #78290, Andreas Persenius.)
+ 
 2002-05-18  Matthias Clasen  <maclas@gmx.de>
 
        * tests/markups/fail-36.gmarkup: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 311a2c73b74d2e3d391aa9cf36046b7753e49477..9154a4e0d9df4fbb09062b383d98710ec384eff2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Mon May 20 15:35:59 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * glib/gfileutils.c (get_contents_regfile): Fix double
+       close of file descriptor on error. (#82139, Wayne Schuller)
+ 
+       * glib/gspawn.c (close_and_invalidate): Don't close
+       fd's that have already been closed. (Fix from Michael
+       Meeks, #81959)
+ 
+       * glib/giochannel.c (g_io_channel_close): If not flushing,
+       dump the contents of the write buffers, so we won't try
+       to write them to an invalid fd later. (Patch from Ron Steinke,
+       fixing #78290, Andreas Persenius.)
+ 
 2002-05-18  Matthias Clasen  <maclas@gmx.de>
 
        * tests/markups/fail-36.gmarkup: 

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index feeba79774fe97205076f35a6eac50f936fc1044..4108e197b5f7963678491af00f0defee6c6518e8 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -416,8 +416,6 @@ get_contents_regfile (const gchar *filename,
         {
           if (errno != EINTR) 
             {
-              close (fd);
-
               g_free (buf);
                   
               g_set_error (error,

diff --git a/glib/giochannel.c b/glib/giochannel.c
index f50eee84009ef09b2700c88114e4eb15f7fab87a..c5e8978162102f53e38b1a8b62dd6044d7637c62 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -346,27 +346,35 @@ g_io_channel_shutdown (GIOChannel *channel,
   g_return_val_if_fail (channel != NULL, G_IO_STATUS_ERROR);
   g_return_val_if_fail (err == NULL || *err == NULL, G_IO_STATUS_ERROR);
 
-  if (flush && channel->write_buf && channel->write_buf->len > 0)
+  if (channel->write_buf && channel->write_buf->len > 0)
     {
-      GIOFlags flags;
+      if (flush)
+        {
+          GIOFlags flags;
       
-      /* Set the channel to blocking, to avoid a busy loop
-       */
-      flags = g_io_channel_get_flags (channel);
-      /* Ignore any errors here, they're irrelevant */
-      g_io_channel_set_flags (channel, flags & ~G_IO_FLAG_NONBLOCK, NULL);
-
-      result = g_io_channel_flush (channel, &tmperr);
+          /* Set the channel to blocking, to avoid a busy loop
+           */
+          flags = g_io_channel_get_flags (channel);
+          /* Ignore any errors here, they're irrelevant */
+          g_io_channel_set_flags (channel, flags & ~G_IO_FLAG_NONBLOCK, NULL);
 
-      if (channel->partial_write_buf[0] != '\0')
-        {
-          g_warning ("Partial character at end of write buffer not flushed.\n");
-          channel->partial_write_buf[0] = '\0';
+          result = g_io_channel_flush (channel, &tmperr);
         }
+      else
+        result = G_IO_STATUS_NORMAL;
+
+      g_string_truncate(channel->write_buf, 0);
     }
   else
     result = G_IO_STATUS_NORMAL;
 
+  if (channel->partial_write_buf[0] != '\0')
+    {
+      if (flush)
+        g_warning ("Partial character at end of write buffer not flushed.\n");
+      channel->partial_write_buf[0] = '\0';
+    }
+
   status = channel->funcs->io_close (channel, err);
 
   channel->close_on_unref = FALSE; /* Because we already did */

diff --git a/glib/gspawn.c b/glib/gspawn.c
index 33960e07c7356110e3f41ebe3ae0d1db6e6d7443..bf152f4692526905d952339e2c662709e05ce86c 100644 (file)
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -119,8 +119,13 @@ close_and_invalidate (gint *fd)
 {
   gint ret;
 
-  ret = close (*fd);
-  *fd = -1;
+  if (*fd < 0)
+    return -1;
+  else
+    {
+      ret = close (*fd);
+      *fd = -1;
+    }
 
   return ret;
 }