handle the unlikely case that no bytes are read from the file and allocate

2005-03-30  Sven Neumann  <sven@gimp.org>

	* glib/gfileutils.c (get_contents_stdio): handle the unlikely case
	that no bytes are read from the file and allocate an empty string.

diff --git a/ChangeLog b/ChangeLog
index a3fc71f..2f70103 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-30  Sven Neumann  <sven@gimp.org>
+
+       * glib/gfileutils.c (get_contents_stdio): handle the unlikely case
+       that no bytes are read from the file and allocate an empty string.
+
 2005-03-30  Tor Lillqvist  <tml@novell.com>
 
        * glib/giowin32.c (g_io_win32_fd_get_flags_internal): Always claim

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a3fc71f..2f70103 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-03-30  Sven Neumann  <sven@gimp.org>
+
+       * glib/gfileutils.c (get_contents_stdio): handle the unlikely case
+       that no bytes are read from the file and allocate an empty string.
+
 2005-03-30  Tor Lillqvist  <tml@novell.com>
 
        * glib/giowin32.c (g_io_win32_fd_get_flags_internal): Always claim

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a3fc71f..2f70103 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-03-30  Sven Neumann  <sven@gimp.org>
+
+       * glib/gfileutils.c (get_contents_stdio): handle the unlikely case
+       that no bytes are read from the file and allocate an empty string.
+
 2005-03-30  Tor Lillqvist  <tml@novell.com>
 
        * glib/giowin32.c (g_io_win32_fd_get_flags_internal): Always claim

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a3fc71f..2f70103 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-03-30  Sven Neumann  <sven@gimp.org>
+
+       * glib/gfileutils.c (get_contents_stdio): handle the unlikely case
+       that no bytes are read from the file and allocate an empty string.
+
 2005-03-30  Tor Lillqvist  <tml@novell.com>
 
        * glib/giowin32.c (g_io_win32_fd_get_flags_internal): Always claim

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 05cd33e..3665215 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -523,6 +523,9 @@ get_contents_stdio (const gchar *display_filename,
 
   fclose (f);
 
+  if (total_bytes == 0)
+    str = g_new (gchar, 1);
+
   str[total_bytes] = '\0';
 
   if (length)