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

Unclear how mosaic_shaped is supposed to work, but added a counter to

Browse source 
prevent recursing too deep, which will cause a crash.
This commit is contained in:
William Kendrick 2014-08-05 17:06:08 +00:00
parent 9202fb6ad9
commit 09c2540e6b
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
magic/src/mosaic_shaped.c
View file

@ -534,6 +534,8 @@ void reset_counter(SDL_Surface * canvas, Uint8 * counter)
}
int scan_fill_count;
int scan_fill(magic_api * api, SDL_Surface * canvas, SDL_Surface * srfc, int x, int y, int fill_edge, int fill_tile, int size, Uint32 color)
{
int leftx, rightx;
@ -543,8 +545,17 @@ int scan_fill(magic_api * api, SDL_Surface * canvas, SDL_Surface * srfc, int x,
leftx = x - 1;
rightx = x + 1;
/* Abort, if we recurse too deep! -bjk 2014.08.05 */
scan_fill_count++;
if (scan_fill_count > 50000)
{
scan_fill_count--;
return (0);
}
if (mosaic_shaped_counted[y * canvas->w + x] == 1)
{
scan_fill_count--;
return (0);
}
@ -555,6 +566,7 @@ int scan_fill(magic_api * api, SDL_Surface * canvas, SDL_Surface * srfc, int x,
fill_square(api, canvas, x, y, size, color);
}
scan_fill_count--;
return (0); /* No need to check more */
}
@ -607,6 +619,7 @@ int scan_fill(magic_api * api, SDL_Surface * canvas, SDL_Surface * srfc, int x,
}
}
scan_fill_count--;
return (1);
}