summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2023-03-01 21:22:28 +0000
committerAdrian Johnson <ajohnson@redneon.com>2023-03-01 21:22:28 +0000
commitbeb28b76793ac84b0936e9104da058c502797970 (patch)
treede5f90e1b1488c627540d9077d5f1b0ccfbeaeb4
parent70e37e23d3dc78200e1f9215cebc9a3d2fcb435a (diff)
parent2cd42566524d3fdce4fc112ad7d72c95e4b860dd (diff)
downloadcairo-beb28b76793ac84b0936e9104da058c502797970.tar.gz
Merge branch 'dont-free-nonheap-object' into 'master'
Open-code bbtree_del to avoid free()ing a non-allocated object Closes #645 See merge request cairo/cairo!465
-rw-r--r--src/cairo-recording-surface.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cairo-recording-surface.c b/src/cairo-recording-surface.c
index 158ea16ba..2912f5ede 100644
--- a/src/cairo-recording-surface.c
+++ b/src/cairo-recording-surface.c
@@ -364,7 +364,10 @@ _cairo_recording_surface_create_bbtree (cairo_recording_surface_t *surface)
return CAIRO_STATUS_SUCCESS;
cleanup:
- bbtree_del (&surface->bbtree);
+ if (surface->bbtree.left)
+ bbtree_del (surface->bbtree.left);
+ if (surface->bbtree.right)
+ bbtree_del (surface->bbtree.right);
return status;
}