luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1560-converter-zero-size' into 'master'

Browse Source 
gresource: Fix handling of zero-sized compressed resource entries

Closes #1560

See merge request GNOME/glib!1752
This commit is contained in:
Sebastian Dröge 2020-11-14 21:35:18 +00:00
commit 728c591d76
4 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gresource.c
View File

@ -800,7 +800,9 @@ g_resource_lookup_data (GResource *resource,
if (!do_lookup (resource, path, lookup_flags, &size, &flags, &data, &data_size, error)) if (!do_lookup (resource, path, lookup_flags, &size, &flags, &data, &data_size, error))
return NULL; return NULL;
if (flags & G_RESOURCE_FLAGS_COMPRESSED) if (size == 0)
return g_bytes_new_with_free_func ("", 0, (GDestroyNotify) g_resource_unref, g_resource_ref (resource));
else if (flags & G_RESOURCE_FLAGS_COMPRESSED)
{ {
char *uncompressed, *d; char *uncompressed, *d;
const char *s; const char *s;

0
gio/tests/empty.txt Normal file
View File

67
gio/tests/resources.c
View File

@ -68,6 +68,15 @@ test_resource (GResource *resource)
g_assert_cmpint (size, ==, 6); g_assert_cmpint (size, ==, 6);
g_assert_cmpuint (flags, ==, G_RESOURCE_FLAGS_COMPRESSED); g_assert_cmpuint (flags, ==, G_RESOURCE_FLAGS_COMPRESSED);
found = g_resource_get_info (resource,
"/empty.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE,
&size, &flags, &error);
g_assert_true (found);
g_assert_no_error (error);
g_assert_cmpint (size, ==, 0);
g_assert_cmpuint (flags, ==, G_RESOURCE_FLAGS_COMPRESSED);
found = g_resource_get_info (resource, found = g_resource_get_info (resource,
"/a_prefix/test2.txt", "/a_prefix/test2.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
@ -105,6 +114,14 @@ test_resource (GResource *resource)
g_assert_no_error (error); g_assert_no_error (error);
g_bytes_unref (data); g_bytes_unref (data);
data = g_resource_lookup_data (resource,
"/empty.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE,
&error);
g_assert_cmpuint (g_bytes_get_size (data), ==, 0);
g_assert_no_error (error);
g_bytes_unref (data);
for (i = 0; i < G_N_ELEMENTS (not_found_paths); i++) for (i = 0; i < G_N_ELEMENTS (not_found_paths); i++)
{ {
in = g_resource_open_stream (resource, in = g_resource_open_stream (resource,
@ -136,6 +153,24 @@ test_resource (GResource *resource)
g_assert_no_error (error); g_assert_no_error (error);
g_clear_object (&in); g_clear_object (&in);
in = g_resource_open_stream (resource,
"/empty.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE,
&error);
g_assert_no_error (error);
g_assert_nonnull (in);
success = g_input_stream_read_all (in, buffer, sizeof (buffer) - 1,
&size,
NULL, &error);
g_assert_no_error (error);
g_assert_true (success);
g_assert_cmpint (size, ==, 0);
g_input_stream_close (in, NULL, &error);
g_assert_no_error (error);
g_clear_object (&in);
data = g_resource_lookup_data (resource, data = g_resource_lookup_data (resource,
"/a_prefix/test2.txt", "/a_prefix/test2.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
@ -398,6 +433,14 @@ test_resource_registered (void)
g_assert_cmpint (size, ==, 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == (G_RESOURCE_FLAGS_COMPRESSED)); g_assert (flags == (G_RESOURCE_FLAGS_COMPRESSED));
found = g_resources_get_info ("/empty.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE,
&size, &flags, &error);
g_assert_no_error (error);
g_assert_true (found);
g_assert_cmpint (size, ==, 0);
g_assert (flags == (G_RESOURCE_FLAGS_COMPRESSED));
found = g_resources_get_info ("/a_prefix/test2.txt", found = g_resources_get_info ("/a_prefix/test2.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
&size, &flags, &error); &size, &flags, &error);
@ -440,6 +483,30 @@ test_resource_registered (void)
g_assert_no_error (error); g_assert_no_error (error);
g_clear_object (&in); g_clear_object (&in);
data = g_resources_lookup_data ("/empty.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE,
&error);
g_assert_no_error (error);
g_assert_cmpuint (g_bytes_get_size (data), ==, 0);
g_bytes_unref (data);
in = g_resources_open_stream ("/empty.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE,
&error);
g_assert_no_error (error);
g_assert_nonnull (in);
success = g_input_stream_read_all (in, buffer, sizeof (buffer) - 1,
&size,
NULL, &error);
g_assert_no_error (error);
g_assert_true (success);
g_assert_cmpint (size, ==, 0);
g_input_stream_close (in, NULL, &error);
g_assert_no_error (error);
g_clear_object (&in);
data = g_resources_lookup_data ("/a_prefix/test2.txt", data = g_resources_lookup_data ("/a_prefix/test2.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
&error); &error);

1
gio/tests/test.gresource.xml
View File

@ -4,6 +4,7 @@
<file >test-generated.txt</file> <file >test-generated.txt</file>
<file compressed="true">test1.txt</file> <file compressed="true">test1.txt</file>
<file preprocess="xml-stripblanks">test.gresource.xml</file> <file preprocess="xml-stripblanks">test.gresource.xml</file>
<file compressed="true">empty.txt</file>
</gresource> </gresource>
<gresource prefix="/a_prefix"> <gresource prefix="/a_prefix">
<file alias="test2-alias.txt">test2.txt</file> <file alias="test2-alias.txt">test2.txt</file>