From eccf6b573bcc21851695583c3dfd9b1217427fb6 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 20 Mar 2002 16:21:58 +0000 Subject: [PATCH] Close the file descriptor. (#75507, Matthias Clasen) Wed Mar 20 11:17:32 2002 Owen Taylor * glib/gfileutils.c (get_contents_regfile): Close the file descriptor. (#75507, Matthias Clasen) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gfileutils.c | 12 ++++++++++-- 8 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index be2111a..01307bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 20 11:17:32 2002 Owen Taylor + + * glib/gfileutils.c (get_contents_regfile): Close the + file descriptor. (#75507, Matthias Clasen) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index be2111a..01307bc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Mar 20 11:17:32 2002 Owen Taylor + + * glib/gfileutils.c (get_contents_regfile): Close the + file descriptor. (#75507, Matthias Clasen) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index be2111a..01307bc 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Wed Mar 20 11:17:32 2002 Owen Taylor + + * glib/gfileutils.c (get_contents_regfile): Close the + file descriptor. (#75507, Matthias Clasen) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index be2111a..01307bc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Mar 20 11:17:32 2002 Owen Taylor + + * glib/gfileutils.c (get_contents_regfile): Close the + file descriptor. (#75507, Matthias Clasen) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index be2111a..01307bc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Mar 20 11:17:32 2002 Owen Taylor + + * glib/gfileutils.c (get_contents_regfile): Close the + file descriptor. (#75507, Matthias Clasen) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index be2111a..01307bc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Mar 20 11:17:32 2002 Owen Taylor + + * glib/gfileutils.c (get_contents_regfile): Close the + file descriptor. (#75507, Matthias Clasen) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index be2111a..01307bc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Mar 20 11:17:32 2002 Owen Taylor + + * glib/gfileutils.c (get_contents_regfile): Close the + file descriptor. (#75507, Matthias Clasen) + Wed Mar 20 11:00:59 2002 Owen Taylor * configure.in: Use $PKG_CONFIG, not pkg-config. diff --git a/glib/gfileutils.c b/glib/gfileutils.c index fbe8bd7..feeba79 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 -- 2.7.4