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

"Foam" magic: avoid crash if can't load image data

Browse source
This commit is contained in:
Bill Kendrick 2023-11-12 15:14:09 -08:00
parent ca68c47bbd
commit 3cf0223947
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/CHANGES.txt
View file

@ -38,6 +38,9 @@ https://tuxpaint.org/
AppData. AppData.
TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp> TOYAMA Shin-ichi <dolphin6k@wmail.plala.or.jp>
* "Foam" magic tool -- avoid crash if image data cannot be loaded.
Bill Kendrick <bill@newbreedsoftware.com>
* Localization Updates: * Localization Updates:
--------------------- ---------------------
* Bulgarian * Bulgarian

13
magic/src/foam.c
View file

@ -23,7 +23,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: April 20, 2023 Last updated: November 12, 2023
*/ */
#include <stdio.h> #include <stdio.h>
@ -87,6 +87,11 @@ int foam_init(magic_api * api, Uint32 disabled_features ATTRIBUTE_UNUSED)
snprintf(fname, sizeof(fname), "%simages/magic/foam_data.png", api->data_directory); snprintf(fname, sizeof(fname), "%simages/magic/foam_data.png", api->data_directory);
foam_data = IMG_Load(fname); foam_data = IMG_Load(fname);
if (foam_data == NULL)
{
fprintf(stderr, "Cannot load %s\n", fname);
return (0);
}
foam_7 = api->scale(foam_data, ((api->canvas_w / FOAM_PROP) * 4) / 4, ((api->canvas_h / FOAM_PROP) * 4) / 4, 1); foam_7 = api->scale(foam_data, ((api->canvas_w / FOAM_PROP) * 4) / 4, ((api->canvas_h / FOAM_PROP) * 4) / 4, 1);
foam_5 = api->scale(foam_data, ((api->canvas_w / FOAM_PROP) * 3) / 4, ((api->canvas_h / FOAM_PROP) * 3) / 4, 1); foam_5 = api->scale(foam_data, ((api->canvas_w / FOAM_PROP) * 3) / 4, ((api->canvas_h / FOAM_PROP) * 3) / 4, 1);
@ -95,6 +100,12 @@ int foam_init(magic_api * api, Uint32 disabled_features ATTRIBUTE_UNUSED)
SDL_FreeSurface(foam_data); SDL_FreeSurface(foam_data);
if (foam_7 == NULL || foam_5 == NULL || foam_3 == NULL || foam_1 == NULL)
{
fprintf(stderr, "Cannot scale %s\n", fname);
return(0);
}
return (1); return (1);
} }