From: Owen Taylor <otaylor@redhat.com>
Date: Wed, 20 Mar 2002 16:21:58 +0000 (+0000)
Subject: Close the file descriptor. (#75507, Matthias Clasen)
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=eccf6b573bcc21851695583c3dfd9b1217427fb6;p=dana%2Fcg-glib.git

Close the file descriptor. (#75507, Matthias Clasen)

Wed Mar 20 11:17:32 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/gfileutils.c (get_contents_regfile): Close the
        file descriptor. (#75507, Matthias Clasen)
---

diff --git a/ChangeLog b/ChangeLog
index be2111ac..01307bc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 20 11:17:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gfileutils.c (get_contents_regfile): Close the
+	file descriptor. (#75507, Matthias Clasen)
+
 Wed Mar 20 11:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use $PKG_CONFIG, not pkg-config.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index be2111ac..01307bc1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Mar 20 11:17:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gfileutils.c (get_contents_regfile): Close the
+	file descriptor. (#75507, Matthias Clasen)
+
 Wed Mar 20 11:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use $PKG_CONFIG, not pkg-config.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index be2111ac..01307bc1 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Wed Mar 20 11:17:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gfileutils.c (get_contents_regfile): Close the
+	file descriptor. (#75507, Matthias Clasen)
+
 Wed Mar 20 11:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use $PKG_CONFIG, not pkg-config.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index be2111ac..01307bc1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Mar 20 11:17:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gfileutils.c (get_contents_regfile): Close the
+	file descriptor. (#75507, Matthias Clasen)
+
 Wed Mar 20 11:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use $PKG_CONFIG, not pkg-config.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index be2111ac..01307bc1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Mar 20 11:17:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gfileutils.c (get_contents_regfile): Close the
+	file descriptor. (#75507, Matthias Clasen)
+
 Wed Mar 20 11:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use $PKG_CONFIG, not pkg-config.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index be2111ac..01307bc1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Mar 20 11:17:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gfileutils.c (get_contents_regfile): Close the
+	file descriptor. (#75507, Matthias Clasen)
+
 Wed Mar 20 11:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use $PKG_CONFIG, not pkg-config.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index be2111ac..01307bc1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Mar 20 11:17:32 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gfileutils.c (get_contents_regfile): Close the
+	file descriptor. (#75507, Matthias Clasen)
+
 Wed Mar 20 11:00:59 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Use $PKG_CONFIG, not pkg-config.
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index fbe8bd72..feeba797 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -402,7 +402,7 @@ get_contents_regfile (const gchar *filename,
                    _("Could not allocate %lu bytes to read file \"%s\""),
                    (gulong) alloc_size, filename);
 
-      return FALSE;
+      goto error;
     }
   
   bytes_read = 0;
@@ -426,7 +426,7 @@ get_contents_regfile (const gchar *filename,
                            _("Failed to read from file '%s': %s"),
                            filename, g_strerror (errno));
 
-              return FALSE;
+	      goto error;
             }
         }
       else if (rc == 0)
@@ -442,7 +442,15 @@ get_contents_regfile (const gchar *filename,
   
   *contents = buf;
 
+  close (fd);
+
   return TRUE;
+
+ error:
+
+  close (fd);
+  
+  return FALSE;
 }
 
 static gboolean