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

Merge branch 'allow-null-buffer-zero-count-output-stream-write' into 'main'

Browse Source 
g_output_stream_write: Allow NULL buffer if count is 0

Closes #3402

See merge request GNOME/glib!4123
This commit is contained in:
Michael Catanzaro 2024-06-26 18:57:29 +00:00
commit 22c6aa9407
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/goutputstream.c
View File

@ -216,7 +216,7 @@ g_output_stream_write (GOutputStream *stream,
gssize res; gssize res;
g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream), -1); g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream), -1);
g_return_val_if_fail (buffer != NULL, 0); g_return_val_if_fail (buffer != NULL || count == 0, 0);
if (count == 0) if (count == 0)
return 0; return 0;

5
gio/tests/memory-output-stream.c
View File

@ -307,6 +307,7 @@ test_write_null (void)
{ {
GOutputStream *mo; GOutputStream *mo;
GError *error = NULL; GError *error = NULL;
gssize bytes_written;
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2471"); g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2471");
@ -316,6 +317,10 @@ test_write_null (void)
g_assert_cmpint (0, ==, g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo))); g_assert_cmpint (0, ==, g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mo)));
bytes_written = g_output_stream_write (mo, NULL, 0, NULL, &error);
g_assert_no_error (error);
g_assert_cmpint (0, ==, bytes_written);
g_output_stream_close (mo, NULL, &error); g_output_stream_close (mo, NULL, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_object_unref (mo); g_object_unref (mo);