notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempting to prevent invalid memory access...

Browse source 
...during linear gradient fill.

h/t Peter Link <peterlink3 on SourceForge>
https://sourceforge.net/p/tuxpaint/bugs/287/
This commit is contained in:
Bill Kendrick 2024-04-18 00:25:02 -07:00
parent d3e229ad47
commit 0aa370ba44
2 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docs/CHANGES.txt
View file

@ -6,7 +6,7 @@ Copyright (c) 2002-2024
Various contributors (see below, and AUTHORS.txt) Various contributors (see below, and AUTHORS.txt)
https://tuxpaint.org/ https://tuxpaint.org/
2024.April.12 (0.9.33) 2024.April.18 (0.9.33)
* New Magic Tools: * New Magic Tools:
---------------- ----------------
* WIP Specular Reflection: Draws a slightly blurred, wavy, and * WIP Specular Reflection: Draws a slightly blurred, wavy, and
@ -79,6 +79,13 @@ https://tuxpaint.org/
* Portuguese (Portugal) translation * Portuguese (Portugal) translation
Hugo Carvalho <hugokarvalho@hotmail.com> Hugo Carvalho <hugokarvalho@hotmail.com>
* Bug Fixes:
----------
* Attempting to prevent invalid memory access during linear gradient fill.
h/t Peter Link <peterlink3 on SourceForge>
https://sourceforge.net/p/tuxpaint/bugs/287/
Bill Kendrick <bill@newbreedsoftware.com>
2024.January.29 (0.9.32) 2024.January.29 (0.9.32)
* Improvements to Magic tools: * Improvements to Magic tools:
---------------------------- ----------------------------

69
src/fill.c
View file

@ -4,7 +4,7 @@
Fill tool Fill tool
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2023 by Bill Kendrick and others; see AUTHORS.txt Copyright (c) 2002-2024 by Bill Kendrick and others; see AUTHORS.txt
bill@newbreedsoftware.com bill@newbreedsoftware.com
https://tuxpaint.org/ https://tuxpaint.org/
@ -27,7 +27,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
Last updated: February 26, 2023 Last updated: April 18, 2024
$Id$ $Id$
*/ */
@ -573,43 +573,46 @@ void draw_linear_gradient(SDL_Surface * canvas, SDL_Surface * last,
for (yy = y_top; yy <= y_bottom; yy++) for (yy = y_top; yy <= y_bottom; yy++)
{ {
for (xx = x_left; xx <= x_right; xx++) if (yy >= 0 && yy < canvas->h)
{ {
if (touched[(yy * canvas->w) + xx]) for (xx = x_left; xx <= x_right; xx++)
{ {
/* Get the old color, and blend it (with a distance-based ratio) with the target color */ if (xx >= 0 && xx < canvas->w && touched[(yy * canvas->w) + xx])
old_colr = getpixels[last->format->BytesPerPixel] (last, xx, yy);
SDL_GetRGB(old_colr, last->format, &old_r, &old_g, &old_b);
/* (h/t David Z on StackOverflow for how to quickly compute this:
https://stackoverflow.com/questions/521493/creating-a-linear-gradient-in-2d-array) */
C = (A * xx) + (B * yy);
if (C < C1)
{ {
/* At/beyond the click spot (opposite direction of mouse); solid color */ /* Get the old color, and blend it (with a distance-based ratio) with the target color */
ratio = 0.0; old_colr = getpixels[last->format->BytesPerPixel] (last, xx, yy);
} SDL_GetRGB(old_colr, last->format, &old_r, &old_g, &old_b);
else if (C >= C2)
{
/* At/beyond the mouse; completely faded out */
ratio = 1.0;
}
else
{
/* The actual gradient... */
ratio = (C - C1) / (C2 - C1);
}
/* Apply fuzziness at any antialiased edges we detected */ /* (h/t David Z on StackOverflow for how to quickly compute this:
ratio = (ratio * ((float)touched[yy * canvas->w + xx] / 255.0)); https://stackoverflow.com/questions/521493/creating-a-linear-gradient-in-2d-array) */
C = (A * xx) + (B * yy);
new_r = (Uint8) (((float)old_r) * ratio + ((float)draw_r * (1.0 - ratio))); if (C < C1)
new_g = (Uint8) (((float)old_g) * ratio + ((float)draw_g * (1.0 - ratio))); {
new_b = (Uint8) (((float)old_b) * ratio + ((float)draw_b * (1.0 - ratio))); /* At/beyond the click spot (opposite direction of mouse); solid color */
ratio = 0.0;
}
else if (C >= C2)
{
/* At/beyond the mouse; completely faded out */
ratio = 1.0;
}
else
{
/* The actual gradient... */
ratio = (C - C1) / (C2 - C1);
}
new_colr = SDL_MapRGB(canvas->format, new_r, new_g, new_b); /* Apply fuzziness at any antialiased edges we detected */
putpixels[canvas->format->BytesPerPixel] (canvas, xx, yy, new_colr); ratio = (ratio * ((float)touched[yy * canvas->w + xx] / 255.0));
new_r = (Uint8) (((float)old_r) * ratio + ((float)draw_r * (1.0 - ratio)));
new_g = (Uint8) (((float)old_g) * ratio + ((float)draw_g * (1.0 - ratio)));
new_b = (Uint8) (((float)old_b) * ratio + ((float)draw_b * (1.0 - ratio)));
new_colr = SDL_MapRGB(canvas->format, new_r, new_g, new_b);
putpixels[canvas->format->BytesPerPixel] (canvas, xx, yy, new_colr);
}
} }
} }
} }