fix memory leak in Canvas constructor

Don't recreate the cairo surface when the canvas is constructed. Fixes #922
Automattic · Jun 27, 2017 · 5889663 · 5889663
1 parent 4f4f857
commit 5889663
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/Canvas.cc b/src/Canvas.cc
@@ -617,7 +617,6 @@ NAN_METHOD(Canvas::RegisterFont) {
 
 Canvas::Canvas(Backend* backend) : ObjectWrap() {
   _backend = backend;
-  this->backend()->createSurface();
 }
 
 /*

diff --git a/src/backend/ImageBackend.cc b/src/backend/ImageBackend.cc
@@ -17,9 +17,10 @@ ImageBackend::~ImageBackend()
 
 cairo_surface_t* ImageBackend::createSurface()
 {
+	assert(!this->surface);
 	this->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
 	assert(this->surface);
-  Nan::AdjustExternalMemory(4 * width * height);
+	Nan::AdjustExternalMemory(4 * width * height);
 
 	return this->surface;
 }
@@ -35,7 +36,6 @@ cairo_surface_t* ImageBackend::recreateSurface()
 	return createSurface();
 }
 
-
 Nan::Persistent<FunctionTemplate> ImageBackend::constructor;
 
 void ImageBackend::Initialize(Handle<Object> target)

diff --git a/src/backend/PdfBackend.cc b/src/backend/PdfBackend.cc
@@ -13,6 +13,8 @@ using namespace v8;
 PdfBackend::PdfBackend(int width, int height)
 	: Backend("pdf", width, height)
 {
+	_closure = malloc(sizeof(closure_t));
+	assert(_closure);
 	createSurface();
 }
 
@@ -28,8 +30,6 @@ PdfBackend::~PdfBackend()
 
 cairo_surface_t* PdfBackend::createSurface()
 {
-	_closure = malloc(sizeof(closure_t));
-	assert(_closure);
 	cairo_status_t status = closure_init((closure_t*)_closure, this->canvas, 0, PNG_NO_FILTERS);
 	assert(status == CAIRO_STATUS_SUCCESS);
 

diff --git a/src/backend/SvgBackend.cc b/src/backend/SvgBackend.cc
@@ -15,7 +15,6 @@ SvgBackend::SvgBackend(int width, int height)
 {
 	_closure = malloc(sizeof(closure_t));
 	assert(_closure);
-
 	createSurface();
 }