luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/hughsie/gbytes-null' into 'main'

Browse Source 
glib/gbytes: Be more careful when saving a GBytes of NULL

See merge request GNOME/glib!4406
This commit is contained in:
Michael Catanzaro 2024-11-20 16:08:40 +00:00
commit b21bc8d49f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/gbytes.c
View File

@ -128,7 +128,7 @@ g_bytes_new (gconstpointer data,
GBytesInline *bytes; GBytesInline *bytes;
bytes = g_malloc (sizeof *bytes + size); bytes = g_malloc (sizeof *bytes + size);
bytes->bytes.data = bytes->inline_data; bytes->bytes.data = data != NULL ? bytes->inline_data : NULL;
bytes->bytes.size = size; bytes->bytes.size = size;
bytes->bytes.free_func = NULL; bytes->bytes.free_func = NULL;
bytes->bytes.user_data = NULL; bytes->bytes.user_data = NULL;

1
glib/tests/bytes.c
View File

@ -451,6 +451,7 @@ test_null (void)
gsize size; gsize size;
bytes = g_bytes_new (NULL, 0); bytes = g_bytes_new (NULL, 0);
g_assert_null (g_bytes_get_data (bytes, NULL));
data = g_bytes_unref_to_data (bytes, &size); data = g_bytes_unref_to_data (bytes, &size);