dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #6610: crashes on free select for images of certain dimensions.

Browse source 
g_alloca() is unadvised. Even though it might be more efficient in some
specific cases, it is pretty subject to stack overflow when a lot of
memory is requested.

Let's allocate dynamic memory instead. To avoid doing it too much, let's
just reuse the same pointer especially since region of interest will
usually be the same size when iterating a buffer, except for border
ones (which would usually be smaller, so we can use the same allocated
buffer again). I still make size checks, just in case.
This commit is contained in:
Jehan 2021-08-04 00:29:56 +02:00
parent 6664b31d68
commit f2fb98cb69
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/core/gimpscanconvert.c
View file

@ -497,6 +497,8 @@ gimp_scan_convert_render_full (GimpScanConvert *sc,
gdouble value)
{
const Babl *format;
guchar *shared_buf = NULL;
gsize shared_buf_size = 0;
GeglBufferIterator *iter;
GeglRectangle *roi;
cairo_t *cr;
@ -545,7 +547,13 @@ gimp_scan_convert_render_full (GimpScanConvert *sc,
*/
if (roi->width * bpp != stride)
{
tmp_buf = g_alloca (stride * roi->height);
if (shared_buf_size < stride * roi->height)
{
shared_buf_size = stride * roi->height;
g_free (shared_buf);
shared_buf = g_malloc (shared_buf_size);
}
tmp_buf = shared_buf;
if (! replace)
{
@ -634,4 +642,6 @@ gimp_scan_convert_render_full (GimpScanConvert *sc,
}
}
}
g_free (shared_buf);
}