Fix potential memory leak if shrink-on-load re-open fails

Author: lovell

docs/src/content/docs/changelog/v0.35.6.md

@@ -11,6 +11,8 @@ https://github.com/lovell/sharp-libvips/releases/tag/v1.3.4
 
 * Fix potential memory leak when extending animated images.
 
+* Fix potential memory leak when shrink-on-load fails to re-open a file.
+
 * Improve `pipelineColourspace` ICC profile colour management.
   [#4596](https://github.com/lovell/sharp/pull/4596)
   [@mertalev](https://github.com/mertalev)

src/pipeline.cc

@@ -270,7 +270,12 @@ class PipelineWorker : public Napi::AsyncWorker {
         if (baton->input->buffer != nullptr) {
           // Reload JPEG buffer
           VipsBlob *blob = vips_blob_new(nullptr, baton->input->buffer, baton->input->bufferLength);
-          image = VImage::jpegload_buffer(blob, option);
+          try {
+            image = VImage::jpegload_buffer(blob, option);
+          } catch (...) {
+            vips_area_unref(reinterpret_cast<VipsArea*>(blob));
+            throw;
+          }
           vips_area_unref(reinterpret_cast<VipsArea*>(blob));
         } else {
           // Reload JPEG file
@@ -282,7 +287,12 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->input->buffer != nullptr) {
             // Reload WebP buffer
             VipsBlob *blob = vips_blob_new(nullptr, baton->input->buffer, baton->input->bufferLength);
-            image = VImage::webpload_buffer(blob, option);
+            try {
+              image = VImage::webpload_buffer(blob, option);
+            } catch (...) {
+              vips_area_unref(reinterpret_cast<VipsArea*>(blob));
+              throw;
+            }
             vips_area_unref(reinterpret_cast<VipsArea*>(blob));
           } else {
             // Reload WebP file
@@ -292,7 +302,12 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->input->buffer != nullptr) {
             // Reload SVG buffer
             VipsBlob *blob = vips_blob_new(nullptr, baton->input->buffer, baton->input->bufferLength);
-            image = VImage::svgload_buffer(blob, option);
+            try {
+              image = VImage::svgload_buffer(blob, option);
+            } catch (...) {
+              vips_area_unref(reinterpret_cast<VipsArea*>(blob));
+              throw;
+            }
             vips_area_unref(reinterpret_cast<VipsArea*>(blob));
           } else {
             // Reload SVG file
@@ -306,7 +321,12 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->input->buffer != nullptr) {
             // Reload PDF buffer
             VipsBlob *blob = vips_blob_new(nullptr, baton->input->buffer, baton->input->bufferLength);
-            image = VImage::pdfload_buffer(blob, option);
+            try {
+              image = VImage::pdfload_buffer(blob, option);
+            } catch (...) {
+              vips_area_unref(reinterpret_cast<VipsArea*>(blob));
+              throw;
+            }
             vips_area_unref(reinterpret_cast<VipsArea*>(blob));
           } else {
             // Reload PDF file