double-free via g_object_unref that could crash

Fixes #2486

Author: chearon

CHANGELOG.md

@@ -9,7 +9,9 @@ project adheres to [Semantic Versioning](http://semver.org/).
 ==================
 ### Changed
 ### Added
+
 ### Fixed
+* Fix a crash when SVGs without width or height are loaded (#2486)
 
 3.1.0
 ==================

src/Image.cc

@@ -1470,8 +1470,6 @@ cairo_status_t
 Image::loadSVGFromBuffer(uint8_t *buf, unsigned len) {
   _is_svg = true;
 
-  cairo_status_t status;
-
   if (NULL == (_rsvg = rsvg_handle_new_from_data(buf, len, nullptr))) {
     return CAIRO_STATUS_READ_ERROR;
   }
@@ -1484,13 +1482,7 @@ Image::loadSVGFromBuffer(uint8_t *buf, unsigned len) {
   width = naturalWidth = d_width;
   height = naturalHeight = d_height;
 
-  status = renderSVGToSurface();
-  if (status != CAIRO_STATUS_SUCCESS) {
-    g_object_unref(_rsvg);
-    return status;
-  }
-
-  return CAIRO_STATUS_SUCCESS;
+  return renderSVGToSurface();
 }
 
 /*

test/canvas.test.js

@@ -2513,4 +2513,13 @@ describe('Canvas', function () {
       assert.throws(() => { ctx.beginTag('Link', {}) })
     })
   })
+
+  describe('loadImage', function () {
+    it('doesn\'t crash when you don\'t specify width and height', async function () {
+      await assert.rejects(async () => {
+        const svg = `<svg xmlns="http://www.w3.org/2000/svg"><path d="M1,1"/></svg>`;
+        await loadImage(Buffer.from(svg));
+      });
+    });
+  });
 })