Merge branch 'bentley-ottmann-21apr25' into 'master'

Fix NULL dereference in active_edges_to_traps() provoked by

See merge request cairo/cairo!620
This commit is contained in:
William Bader 2026-05-09 22:14:21 +00:00
commit ae7cc4a98b

View file

@ -468,6 +468,9 @@ active_edges_to_traps (sweep_line_t *sweep)
edge_t *left, *right;
int winding;
if (unlikely (pos == NULL))
break;
left = pos;
winding = left->dir;
@ -503,6 +506,8 @@ active_edges_to_traps (sweep_line_t *sweep)
* boxes.
*/
winding += right->dir;
if (unlikely (right->next == NULL))
break;
if (winding == 0 && right->x != right->next->x)
break;