Commit 2738a70

committed

fix resurface crash with png, svg canvases

Regressed in 3dca82a This was originally added in cfc6dfd, but I don't think that assessment is right at least for the current bug: cairo_destroy, called after the backend's SetWidth, still holds a reference to the surface and calls the closure (presumably for leading <svg> or something?). I can't get it to happen consistently enough to write a test, sadly. Fixes Automattic#2520

1 parent 7a942d4 commit 2738a70Copy full SHA for 2738a70

File tree

2 files changed

-0

lines changed

src/backend
- PdfBackend.cc
- SvgBackend.cc

2 files changed

-0

lines changed

`‎src/backend/PdfBackend.cc‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ cairo_surface_t* PdfBackend::ensureSurface() {`
`22`	`22`
`23`	`23`	`void PdfBackend::destroySurface() {`
`24`	`24`	`if (surface) {`
	`25`	`+ cairo_surface_finish(surface);`
`25`	`26`	`cairo_surface_destroy(surface);`
`26`	`27`	`surface = nullptr;`
`27`	`28`	`assert(_closure);`

`‎src/backend/SvgBackend.cc‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ cairo_surface_t* SvgBackend::ensureSurface() {`
`26`	`26`
`27`	`27`	`void SvgBackend::destroySurface() {`
`28`	`28`	`if (surface) {`
	`29`	`+ cairo_surface_finish(surface);`
`29`	`30`	`cairo_surface_destroy(surface);`
`30`	`31`	`surface = nullptr;`
`31`	`32`	`assert(_closure);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2738a70

File tree

2 files changed

2 files changed

`‎src/backend/PdfBackend.cc‎`

`‎src/backend/SvgBackend.cc‎`

0 commit comments