Merge pull request #162 from kesla/master

Fixes Image memory leak (#150)
Automattic · Apr 25, 2012 · 7adcd31 · 7adcd31
2 parents eb04ff6 + c9f991b
commit 7adcd31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Image.cc b/src/Image.cc
@@ -240,6 +240,7 @@ Image::SetOnerror(Local<String>, Local<Value> val, const AccessorInfo &info) {
  */
 
 Image::Image() {
+  live_data = NULL;
   filename = NULL;
   _surface = NULL;
   width = height = 0;
@@ -255,6 +256,8 @@ Image::~Image() {
     V8::AdjustAmountOfExternalAllocatedMemory(-4 * width * height);
     cairo_surface_destroy(_surface);
   }
+
+  if (live_data) free(live_data);
   if (filename) free(filename);
 }
 
@@ -544,7 +547,7 @@ Image::loadGIFFromBuffer(uint8_t *buf, unsigned len) {
     free(data);
     return status;
   }
-
+  live_data = data;
   return CAIRO_STATUS_SUCCESS;
 }
 #endif /* HAVE_GIF */
@@ -665,7 +668,7 @@ Image::loadJPEGFromBuffer(uint8_t *buf, unsigned len) {
     free(data);
     return status;
   }
-
+  live_data = data;
   return CAIRO_STATUS_SUCCESS;
 }
 

diff --git a/src/Image.h b/src/Image.h
@@ -70,6 +70,7 @@ class Image: public node::ObjectWrap {
 
   private:
     cairo_surface_t *_surface;
+    uint8_t *live_data;
     ~Image();
 };