shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-13 00:58:43 +03:00
Code Issues Projects Releases Wiki Activity

ostree_raw_file_to_content_stream: Make size default to 0

Browse Source 
Some existing code calls into ostree_raw_file_to_content_stream() with
file objects that do not have the standard::size attribute. Since GLib
2.76.0, attempting to access the size of such an object raises a
critical warning. Handle this more gracefully by defaulting the size
to 0, like earlier versions of GLib did.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2023-03-17 12:53:42 +00:00
parent 4238ef4c68
commit 722a4179f3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-core.c
View File

@ -550,7 +550,9 @@ ostree_raw_file_to_content_stream (GInputStream *input,
g_autoptr(GBytes) file_header = _ostree_file_header_new (file_info, xattrs);
*out_input = header_and_input_to_stream (file_header, input);
if (out_length)
*out_length = g_bytes_get_size (file_header) + g_file_info_get_size (file_info);
*out_length = g_bytes_get_size (file_header);
if (out_length && g_file_info_has_attribute (file_info, "standard::size"))
*out_length += g_file_info_get_size (file_info);
return TRUE;
}