Merge branch 'Automattic:master' into reject-null-for-loadImage

Author: Ian-I-Chien

CHANGELOG.md

@@ -12,6 +12,11 @@ project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 * fix: reject loadImage when src is null or invalid
 
+3.1.2
+==================
+### Fixed
+* Fix crash when setting width/height on PDF, SVG canvas (#2520)
+
 3.1.1
 ==================
 ### Fixed

package.json

@@ -1,7 +1,7 @@
 {
   "name": "canvas",
   "description": "Canvas graphics API backed by Cairo",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "author": "TJ Holowaychuk <[email protected]>",
   "main": "index.js",
   "browser": "browser.js",

src/backend/PdfBackend.cc

@@ -22,6 +22,7 @@ cairo_surface_t* PdfBackend::ensureSurface() {
 
 void PdfBackend::destroySurface() {
   if (surface) {
+    cairo_surface_finish(surface);
     cairo_surface_destroy(surface);
     surface = nullptr;
     assert(_closure);

src/backend/SvgBackend.cc

@@ -26,6 +26,7 @@ cairo_surface_t* SvgBackend::ensureSurface() {
 
 void SvgBackend::destroySurface() {
   if (surface) {
+    cairo_surface_finish(surface);
     cairo_surface_destroy(surface);
     surface = nullptr;
     assert(_closure);