blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

LineArt: Protecting bounding area links. 

In case they overflowed the bounding area maximum link count,
Protect the link array so it doesn't crash.
This commit is contained in:
YimingWu 2021-12-27 14:33:39 +08:00
parent 52585b39a1
commit 7cf5f4cc63
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
View File

@ -450,10 +450,10 @@ typedef struct LineartBoundingArea {
ListBase up;
ListBase bp;
int16_t triangle_count;
int16_t max_triangle_count;
int16_t line_count;
int16_t max_line_count;
uint16_t triangle_count;
uint16_t max_triangle_count;
uint16_t line_count;
uint16_t max_line_count;
/* Use array for speeding up multiple accesses. */
struct LineartTriangle **linked_triangles;

13
source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
View File

@ -327,7 +327,12 @@ BLI_INLINE bool lineart_occlusion_is_adjacent_intersection(LineartEdge *e, Linea
static void lineart_bounding_area_triangle_add(LineartRenderBuffer *rb,
LineartBoundingArea *ba,
LineartTriangle *tri)
{
{ /* In case of too many triangles concentrating in one point, do not add anymore, these triangles
* will be either narrower than a single pixel, or will still be added into the list of other
* less dense areas. */
if (ba->triangle_count >= 65535) {
return;
}
if (ba->triangle_count >= ba->max_triangle_count) {
LineartTriangle **new_array = lineart_mem_acquire(
&rb->render_data_pool, sizeof(LineartTriangle *) * ba->max_triangle_count * 2);
@ -343,6 +348,12 @@ static void lineart_bounding_area_line_add(LineartRenderBuffer *rb,
LineartBoundingArea *ba,
LineartEdge *e)
{
/* In case of too many lines concentrating in one point, do not add anymore, these lines will
* be either shorter than a single pixel, or will still be added into the list of other less
* dense areas. */
if (ba->line_count >= 65535) {
return;
}
if (ba->line_count >= ba->max_line_count) {
LineartEdge **new_array = lineart_mem_acquire(&rb->render_data_pool,
sizeof(LineartEdge *) * ba->max_line_count * 2);