Merge branch 'jfkthame-master-patch-35456' into 'master'

Avoid potential null-deref in active_edges()

See merge request cairo/cairo!365
This commit is contained in:
Jonathan Kew 2025-12-25 12:57:59 +00:00
commit 98b48e558b

View file

@ -1158,7 +1158,7 @@ active_edges (cairo_bo_edge_t *left,
if (! is_zero (winding))
break;
if unlikely ((left->deferred.other))
if (unlikely (left->deferred.other))
edges_end (left, top, polygon);
left = left->next;
@ -1168,7 +1168,10 @@ active_edges (cairo_bo_edge_t *left,
right = left->next;
do {
if unlikely ((right->deferred.other))
if (! right)
return;
if (unlikely (right->deferred.other))
edges_end (right, top, polygon);
winding[right->a_or_b] += right->edge.dir;