luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-28 02:20:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trailing-garbage-ignored' into 'main'

Browse Source 
converteroutputstream: Consume extra data at end

Closes #3532

See merge request GNOME/glib!4394
This commit is contained in:
Philip Withnall 2024-11-16 07:46:25 +00:00
commit a85cc64b4b
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gconverteroutputstream.c
View File

@ -422,7 +422,11 @@ write_internal (GOutputStream *stream,
return -1; return -1;
if (priv->finished) if (priv->finished)
return 0; {
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_MESSAGE_TOO_LARGE,
_("Unexpected data after end of conversion"));
return -1;
}
/* Convert as much as possible */ /* Convert as much as possible */
if (buffer_data_size (&priv->output_buffer) > 0) if (buffer_data_size (&priv->output_buffer) > 0)

41
gio/tests/converter.c
View File

@ -23,6 +23,46 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
static void
test_extra_bytes_at_end (void)
{
char data[1024];
gsize size;
GBytes *bytes;
GConverter *converter;
GError *error = NULL;
GBytes *result;
/* Create some simple data to encode */
data[0] = 0;
bytes = g_bytes_new_static (data, 1);
/* encode the data */
converter = G_CONVERTER (g_zlib_compressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP, 9));
result = g_converter_convert_bytes (converter, bytes, &error);
g_assert_no_error (error);
g_assert_nonnull (result);
g_bytes_unref (bytes);
g_clear_object (&converter);
/* Append a 0 byte to the encoded data */
size = g_bytes_get_size (result);
g_assert_cmpuint (size, <, G_N_ELEMENTS (data)); /* just to be very sure */
memcpy (data, g_bytes_get_data (result, NULL), size);
data[size] = 0;
bytes = g_bytes_new_static (data, size + 1);
g_bytes_unref (result);
/* Decompress the just compressed bytes with the extra 0 */
converter = G_CONVERTER (g_zlib_decompressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP));
result = g_converter_convert_bytes (converter, bytes, &error);
g_assert_error (error, G_IO_ERROR, G_IO_ERROR_MESSAGE_TOO_LARGE);
g_assert_null (result);
g_clear_error (&error);
g_object_unref (converter);
g_bytes_unref (bytes);
}
static void static void
test_convert_bytes (void) test_convert_bytes (void)
@ -63,6 +103,7 @@ main (int argc,
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/converter/bytes", test_convert_bytes); g_test_add_func ("/converter/bytes", test_convert_bytes);
g_test_add_func ("/converter/extra-bytes-at-end", test_extra_bytes_at_end);
return g_test_run(); return g_test_run();
} }