luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-31 08:22:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we always have some target space in GConverterOutputStream

Browse Source 
When the converter fills the whole buffer without reading all input,
we need to enlarge the buffer. Otherwise we get an assertion failure
for `outbuf_size > 0' in g_converter_convert.

https://bugzilla.gnome.org/show_bug.cgi?id=619945
This commit is contained in:
Jürg Billeter
2010-05-27 16:55:53 +02:00
committed by Alexander Larsson
parent 85ea72c0c5
commit 86592d675f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gconverteroutputstream.c
View File

@@ -418,6 +418,10 @@ g_converter_output_stream_write (GOutputStream *stream,
converted_bytes = 0; converted_bytes = 0;
while (!priv->finished && converted_bytes < to_convert_size) while (!priv->finished && converted_bytes < to_convert_size)
{ {
/* Ensure we have *some* target space */
if (buffer_tailspace (&priv->converted_buffer) == 0)
grow_buffer (&priv->converted_buffer);
/* Try to convert to our buffer */ /* Try to convert to our buffer */
my_error = NULL; my_error = NULL;
res = g_converter_convert (priv->converter, res = g_converter_convert (priv->converter,
@@ -529,6 +533,10 @@ g_converter_output_stream_flush (GOutputStream *stream,
flushed = FALSE; flushed = FALSE;
while (!priv->finished && !flushed) while (!priv->finished && !flushed)
{ {
/* Ensure we have *some* target space */
if (buffer_tailspace (&priv->converted_buffer) == 0)
grow_buffer (&priv->converted_buffer);
/* Try to convert to our buffer */ /* Try to convert to our buffer */
my_error = NULL; my_error = NULL;
res = g_converter_convert (priv->converter, res = g_converter_convert (priv->converter,