glib r7107 - branches/glib-2-16/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jun 30 03:48:35 2008
New Revision: 7107
URL: http://svn.gnome.org/viewvc/glib?rev=7107&view=rev

Log:
2008-06-29  Matthias Clasen  <mclasen redhat com>

        Bug 540423 â unrecoverable error after g_seekable_truncate(seekable,
        0, ...)

        * gmemoryoutputstream.c (array_resize): Handle truncation to
        zero correctly. Reported by Akira Tagoh



Modified:
   branches/glib-2-16/gio/ChangeLog
   branches/glib-2-16/gio/gmemoryoutputstream.c

Modified: branches/glib-2-16/gio/gmemoryoutputstream.c
==============================================================================
--- branches/glib-2-16/gio/gmemoryoutputstream.c	(original)
+++ branches/glib-2-16/gio/gmemoryoutputstream.c	Mon Jun 30 03:48:35 2008
@@ -308,7 +308,7 @@
   len = priv->len;
   data = priv->realloc_fn (priv->data, size);
 
-  if (!data) 
+  if (size > 0 && !data) 
     {
       if (allow_partial &&
 	  priv->pos < priv->len)