callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: avoid CRITICAL when writing 0-length data to XCF

Browse Source 
In xcf_write_int8(), avoid calling g_output_stream_write_all() with
data == NULL and count == 0, in which case it raises a CRITICAL and
doesn't set bytes_written, which we proceed to use uninitialized.
This can happen, e.g., when writing an empty parasite.
This commit is contained in:
Ell
2018-07-05 20:55:51 -04:00
parent 3b228afdbe
commit 8e798e9cf2
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/xcf/xcf-write.c
View File

@ -35,17 +35,23 @@ xcf_write_int8 (XcfInfo *info,
gint count,
GError **error)
{
GError *my_error = NULL;
gsize bytes_written;
GError *my_error = NULL;
gsize bytes_written = 0;
if (! g_output_stream_write_all (info->output, data, count,
&bytes_written, NULL, &my_error))
/* we allow for 'data == NULL && count == 0', which
* g_output_stream_write_all() rejects.
*/
if (count > 0)
{
g_propagate_prefixed_error (error, my_error,
_("Error writing XCF: "));
}
if (! g_output_stream_write_all (info->output, data, count,
&bytes_written, NULL, &my_error))
{
g_propagate_prefixed_error (error, my_error,
_("Error writing XCF: "));
}
info->cp += bytes_written;
info->cp += bytes_written;
}
return bytes_written;
}